diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 21:43:01 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 21:48:54 +0400 |
commit | 032ba74ed29e0af77da04d2305b0470cb42b1955 (patch) | |
tree | 45127c399bf7846d057b07d35d02cf3f6a5f8675 /ffplay.c | |
parent | dd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c (diff) | |
parent | 7bda4ed780c23c4bd50cf9ccd91f235e67ab0eae (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: fix Thumb PIC on Apple
nut: add do {} while (0) to GET_V
tiffenc: Check av_malloc() results.
tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
Use atexit() instead of defining a custom exit_program() interface.
msvc: Fix detection of VFW & Avisynth required libs
Conflicts:
ffmpeg.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -300,10 +300,7 @@ static AVPacket flush_pkt; static SDL_Surface *screen; -void av_noreturn exit_program(int ret) -{ - exit(ret); -} +static int packet_queue_put(PacketQueue *q, AVPacket *pkt); static int packet_queue_put_private(PacketQueue *q, AVPacket *pkt) { @@ -2988,7 +2985,7 @@ static void opt_input_file(void *optctx, const char *filename) if (input_filename) { fprintf(stderr, "Argument '%s' provided as input filename, but '%s' was already specified.\n", filename, input_filename); - exit_program(1); + exit(1); } if (!strcmp(filename, "-")) filename = "pipe:"; |