aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/iff.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-24 05:21:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-24 05:21:19 +0100
commitccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59 (patch)
tree752fdf35a10a7d2df7168f59b9d1b49fd7d01a64 /libavcodec/iff.c
parentf67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7 (diff)
parent8f8bc92365a943e96cc08b5369408c20f35193c7 (diff)
downloadffmpeg-ccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59.tar.gz
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 'libavcodec/iff.c')
-rw-r--r--libavcodec/iff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 5d69539171..e71f5b00b9 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -25,6 +25,8 @@
* IFF ACBM/DEEP/ILBM/PBM bitmap decoder
*/
+#include <stdint.h>
+
#include "libavutil/imgutils.h"
#include "bytestream.h"
#include "avcodec.h"