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 | |
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>
37 files changed, 65 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index cbf660f244..c7e8acf391 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -20,6 +20,7 @@ */ #include <string.h> +#include <stdint.h> #include <stdlib.h> #include <errno.h> #include <math.h> @@ -30,6 +30,8 @@ #include <stdlib.h> #include <errno.h> #include <limits.h> +#include <stdint.h> + #if HAVE_ISATTY #if HAVE_IO_H #include <io.h> @@ -38,6 +40,7 @@ #include <unistd.h> #endif #endif + #include "libavformat/avformat.h" #include "libavdevice/avdevice.h" #include "libswresample/swresample.h" diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index ad97f0dd81..9d945fca49 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "ffmpeg.h" #include "libavfilter/avfilter.h" @@ -28,6 +28,8 @@ #include <math.h> #include <limits.h> #include <signal.h> +#include <stdint.h> + #include "libavutil/avstring.h" #include "libavutil/colorspace.h" #include "libavutil/mathematics.h" 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" diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index dc8805c127..5f8e1f61cc 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavresample/avresample.h" #include "libavutil/attributes.h" #include "libavutil/audio_fifo.h" 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" diff --git a/libavfilter/trim.c b/libavfilter/trim.c index fdc6245649..04e82dab10 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -18,6 +18,7 @@ #include <float.h> #include <math.h> +#include <stdint.h> #include "config.h" diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 1d1b947f3d..e6266ccb50 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -26,6 +26,7 @@ */ #include <float.h> +#include <stdint.h> #include "libavutil/common.h" #include "libavutil/fifo.h" diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 7c0b4fb803..6e3d8bc6ad 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavutil/intfloat.h" #include "libavutil/opt.h" #include "avformat.h" diff --git a/libavformat/assdec.c b/libavformat/assdec.c index 35fcb519c1..c9bd63b3c4 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "avformat.h" #include "internal.h" #include "subtitles.h" diff --git a/libavformat/avidec.c b/libavformat/avidec.c index be9715c4f7..1c6b18c980 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bswap.h" diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index b20ee131b6..679d926da1 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavutil/intreadwrite.h" #include "libavutil/intfloat.h" #include "avformat.h" diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index dcd53e5f40..b9bf60543f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -20,6 +20,7 @@ */ #include <float.h> +#include <stdint.h> #include "libavutil/mathematics.h" #include "libavutil/parseutils.h" diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index eaeccdeb87..e461c5e60e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "avc.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/mov.c b/libavformat/mov.c index bb141c8a2a..94bd32fd28 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -24,6 +24,7 @@ */ #include <limits.h> +#include <stdint.h> //#define MOV_EXPORT_ALL_METADATA diff --git a/libavformat/movenc.c b/libavformat/movenc.c index cfb73d7b39..92ce5341e6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "movenc.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 0a9d69b344..2c7fff22d4 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavutil/attributes.h" #include "libavutil/fifo.h" #include "libavutil/log.h" diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 1787abce12..61c0cb2366 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -43,6 +43,8 @@ * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1 */ +#include <stdint.h> + #include "libavutil/aes.h" #include "libavutil/avassert.h" #include "libavutil/mathematics.h" diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index b6d754d595..10b8fc88eb 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/tree.h" diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 1883501745..e846d3b0f5 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavutil/crc.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" diff --git a/libavformat/rl2.c b/libavformat/rl2.c index ff4006497f..56f4cf29ff 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -32,6 +32,8 @@ * optional background_frame */ +#include <stdint.h> + #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "avformat.h" diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 61a2316412..85b573ea1f 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -19,11 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> +#include <stdlib.h> + #include "libavutil/avstring.h" #include "libavutil/dict.h" #include "avformat.h" #include "internal.h" -#include <stdlib.h> #define RPL_SIGNATURE "ARMovie\x0A" #define RPL_SIGNATURE_SIZE 8 diff --git a/libavformat/seek.c b/libavformat/seek.c index 07c3f79522..bb5ca87cfa 100644 --- a/libavformat/seek.c +++ b/libavformat/seek.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "seek.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index ddaeb3bf87..06758bf8b7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "avformat.h" #include "avio_internal.h" #include "internal.h" diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 202683bb5d..daea64edc5 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavutil/avassert.h" #include "libavutil/dict.h" #include "libavutil/intreadwrite.h" diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 135faf2f7a..e629b3f384 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -20,6 +20,7 @@ */ #include <inttypes.h> +#include <stdint.h> #include "avformat.h" #include "internal.h" diff --git a/libavresample/options.c b/libavresample/options.c index a0dda6f886..5f08cd7e52 100644 --- a/libavresample/options.c +++ b/libavresample/options.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "libavutil/mathematics.h" #include "libavutil/mem.h" #include "libavutil/opt.h" diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 2b85de31d9..4c0677f794 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -23,6 +23,8 @@ * audio channel layout utility functions */ +#include <stdint.h> + #include "avstring.h" #include "avutil.h" #include "channel_layout.h" diff --git a/libavutil/common.h b/libavutil/common.h index e487218e72..c82a3a6240 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -34,6 +34,7 @@ #include <inttypes.h> #include <limits.h> #include <math.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 1dc5abb2b8..e0806b1856 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #include "cpu.h" #include "cpu_internal.h" #include "config.h" |