diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-24 05:21:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-24 05:21:19 +0100 |
| commit | ccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59 (patch) | |
| tree | 752fdf35a10a7d2df7168f59b9d1b49fd7d01a64 /libavcodec | |
| parent | f67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7 (diff) | |
| parent | 8f8bc92365a943e96cc08b5369408c20f35193c7 (diff) | |
| download | ffmpeg-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')
| -rw-r--r-- | libavcodec/aacdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/huffman.c | 2 | ||||
| -rw-r--r-- | libavcodec/iff.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg12enc.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 1 | ||||
| -rw-r--r-- | libavcodec/parser.c | 1 |
7 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 0e1551c23f..1fb91853d0 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -105,6 +105,7 @@ #include <assert.h> #include <errno.h> #include <math.h> +#include <stdint.h> #include <string.h> #if ARCH_ARM diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index 2b64b3ece9..8dd356dde4 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -24,6 +24,8 @@ * huffman tree builder and VLC generator */ +#include <stdint.h> + #include "avcodec.h" #include "get_bits.h" #include "huffman.h" 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" diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 68827895b7..a550379534 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -25,6 +25,8 @@ * MPEG1/2 encoder */ +#include <stdint.h> + #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/log.h" diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1961794fad..caadf17b39 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -27,6 +27,8 @@ * The simplest mpeg encoder (well, it was the simplest!). */ +#include <stdint.h> + #include "libavutil/internal.h" #include "libavutil/intmath.h" #include "libavutil/mathematics.h" diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 427a4a2205..49af29cbcc 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -24,6 +24,7 @@ #include <float.h> #include <limits.h> +#include <stdint.h> #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 8a825938a6..083ce022b5 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> #include <string.h> #include "parser.h" |