diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-17 17:06:07 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-17 17:06:52 +0200 |
commit | fa3fde168b8c3d2d7c008a98457832575dbf9fe0 (patch) | |
tree | 44ac6dc9bc226deb2310c4ba901c28e202c777fa /compat | |
parent | 517a2bbcf131df3e61ff4494d7f695b4570bc5fc (diff) | |
parent | 4aa3d7b3f2b71296d73276d62be4e806b34d2d01 (diff) | |
download | ffmpeg-streaming-fa3fde168b8c3d2d7c008a98457832575dbf9fe0.zip ffmpeg-streaming-fa3fde168b8c3d2d7c008a98457832575dbf9fe0.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libvpxenc: use the default bitrate if not set
utvideo: Rename utvideo.c to utvideodec.c
doc: Fix syntax errors in sample Emacs config
mjpegdec: more meaningful return values
configure: clean up Altivec detection
getopt: Remove an unnecessary define
rtmp: Use int instead of ssize_t
getopt: Add missing includes
rtmp: Add support for receiving incoming streams
Add missing includes for code relying on external libraries
Conflicts:
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/mjpegdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat')
-rw-r--r-- | compat/getopt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compat/getopt.c b/compat/getopt.c index 4683647..019049f 100644 --- a/compat/getopt.c +++ b/compat/getopt.c @@ -30,7 +30,8 @@ * in the public domain. */ -#define EOF (-1) +#include <stdio.h> +#include <string.h> static int opterr = 1; static int optind = 1; |