diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 19:43:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 19:48:54 +0200 |
| commit | 032ba74ed29e0af77da04d2305b0470cb42b1955 (patch) | |
| tree | 45127c399bf7846d057b07d35d02cf3f6a5f8675 /ffserver.c | |
| parent | dd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c (diff) | |
| parent | 7bda4ed780c23c4bd50cf9ccd91f235e67ab0eae (diff) | |
| download | ffmpeg-032ba74ed29e0af77da04d2305b0470cb42b1955.tar.gz | |
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 'ffserver.c')
| -rw-r--r-- | ffserver.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ffserver.c b/ffserver.c index 480e6fc15b..7fb61d04ea 100644 --- a/ffserver.c +++ b/ffserver.c @@ -329,11 +329,6 @@ static AVLFG random_state; static FILE *logfile = NULL; /* FIXME: make ffserver work with IPv6 */ -void av_noreturn exit_program(int ret) -{ - exit(ret); -} - /* resolve host with also IP address parsing */ static int resolve_host(struct in_addr *sin_addr, const char *hostname) { |