diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-24 08:21:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-24 08:21:19 +0400 |
commit | ccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59 (patch) | |
tree | 752fdf35a10a7d2df7168f59b9d1b49fd7d01a64 /libavfilter/src_movie.c | |
parent | f67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7 (diff) | |
parent | 8f8bc92365a943e96cc08b5369408c20f35193c7 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add missing #includes for *INT64_MAX and *INT64_C
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavformat/assdec.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/src_movie.c')
-rw-r--r-- | libavfilter/src_movie.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 5bec10fcce..d1289e2fe8 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -28,6 +28,7 @@ */ #include <float.h> +#include <stdint.h> #include "libavutil/attributes.h" #include "libavutil/avstring.h" |