Commit ccdfa3e2 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f67ec7f3 8f8bc923
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
*/ */
#include <string.h> #include <string.h>
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <stdint.h>
#if HAVE_ISATTY #if HAVE_ISATTY
#if HAVE_IO_H #if HAVE_IO_H
#include <io.h> #include <io.h>
...@@ -38,6 +40,7 @@ ...@@ -38,6 +40,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#endif #endif
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavdevice/avdevice.h" #include "libavdevice/avdevice.h"
#include "libswresample/swresample.h" #include "libswresample/swresample.h"
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "ffmpeg.h" #include "ffmpeg.h"
#include "libavfilter/avfilter.h" #include "libavfilter/avfilter.h"
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <math.h> #include <math.h>
#include <limits.h> #include <limits.h>
#include <signal.h> #include <signal.h>
#include <stdint.h>
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/colorspace.h" #include "libavutil/colorspace.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
......
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
#include <stdint.h>
#include <string.h> #include <string.h>
#if ARCH_ARM #if ARCH_ARM
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
* huffman tree builder and VLC generator * huffman tree builder and VLC generator
*/ */
#include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "huffman.h" #include "huffman.h"
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
* IFF ACBM/DEEP/ILBM/PBM bitmap decoder * IFF ACBM/DEEP/ILBM/PBM bitmap decoder
*/ */
#include <stdint.h>
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "bytestream.h" #include "bytestream.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
* MPEG1/2 encoder * MPEG1/2 encoder
*/ */
#include <stdint.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/log.h" #include "libavutil/log.h"
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
* The simplest mpeg encoder (well, it was the simplest!). * The simplest mpeg encoder (well, it was the simplest!).
*/ */
#include <stdint.h>
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/intmath.h" #include "libavutil/intmath.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <float.h> #include <float.h>
#include <limits.h> #include <limits.h>
#include <stdint.h>
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include <string.h> #include <string.h>
#include "parser.h" #include "parser.h"
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavresample/avresample.h" #include "libavresample/avresample.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/audio_fifo.h" #include "libavutil/audio_fifo.h"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
*/ */
#include <float.h> #include <float.h>
#include <stdint.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <stdint.h>
#include "config.h" #include "config.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include <float.h> #include <float.h>
#include <stdint.h>
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavutil/intfloat.h" #include "libavutil/intfloat.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avformat.h" #include "avformat.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "subtitles.h" #include "subtitles.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/intfloat.h" #include "libavutil/intfloat.h"
#include "avformat.h" #include "avformat.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
*/ */
#include <float.h> #include <float.h>
#include <stdint.h>
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "avc.h" #include "avc.h"
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h" #include "avio_internal.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include <limits.h> #include <limits.h>
#include <stdint.h>
//#define MOV_EXPORT_ALL_METADATA //#define MOV_EXPORT_ALL_METADATA
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "movenc.h" #include "movenc.h"
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h" #include "avio_internal.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
#include "libavutil/log.h" #include "libavutil/log.h"
......
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
* Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1 * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1
*/ */
#include <stdint.h>
#include "libavutil/aes.h" #include "libavutil/aes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/tree.h" #include "libavutil/tree.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
* optional background_frame * optional background_frame
*/ */
#include <stdint.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "avformat.h" #include "avformat.h"
......
...@@ -19,11 +19,13 @@ ...@@ -19,11 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include <stdlib.h>
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include <stdlib.h>
#define RPL_SIGNATURE "ARMovie\x0A" #define RPL_SIGNATURE "ARMovie\x0A"
#define RPL_SIGNATURE_SIZE 8 #define RPL_SIGNATURE_SIZE 8
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "seek.h" #include "seek.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "internal.h" #include "internal.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include <stdint.h>
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* audio channel layout utility functions * audio channel layout utility functions
*/ */
#include <stdint.h>
#include "avstring.h" #include "avstring.h"
#include "avutil.h" #include "avutil.h"
#include "channel_layout.h" #include "channel_layout.h"
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include "cpu.h" #include "cpu.h"
#include "cpu_internal.h" #include "cpu_internal.h"
#include "config.h" #include "config.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment