falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
f67ec7f3a2 8f8bc92365
commit
ccdfa3e271
37 changed files with 65 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      cmdutils.c
  2. +3
    -0
      ffmpeg.c
  3. +2
    -0
      ffmpeg_filter.c
  4. +2
    -0
      ffplay.c
  5. +1
    -0
      libavcodec/aacdec.c
  6. +2
    -0
      libavcodec/huffman.c
  7. +2
    -0
      libavcodec/iff.c
  8. +2
    -0
      libavcodec/mpeg12enc.c
  9. +2
    -0
      libavcodec/mpegvideo_enc.c
  10. +1
    -0
      libavcodec/options_table.h
  11. +1
    -0
      libavcodec/parser.c
  12. +2
    -0
      libavfilter/af_asyncts.c
  13. +1
    -0
      libavfilter/src_movie.c
  14. +1
    -0
      libavfilter/trim.c
  15. +1
    -0
      libavfilter/vf_fps.c
  16. +2
    -0
      libavformat/aiffenc.c
  17. +2
    -0
      libavformat/assdec.c
  18. +2
    -0
      libavformat/avidec.c
  19. +2
    -0
      libavformat/ffmdec.c
  20. +1
    -0
      libavformat/hlsenc.c
  21. +2
    -0
      libavformat/matroskaenc.c
  22. +1
    -0
      libavformat/mov.c
  23. +2
    -0
      libavformat/movenc.c
  24. +2
    -0
      libavformat/mpegenc.c
  25. +2
    -0
      libavformat/mxfdec.c
  26. +2
    -0
      libavformat/nutenc.c
  27. +2
    -0
      libavformat/oggenc.c
  28. +2
    -0
      libavformat/rl2.c
  29. +3
    -1
      libavformat/rpl.c
  30. +2
    -0
      libavformat/seek.c
  31. +2
    -0
      libavformat/utils.c
  32. +2
    -0
      libavformat/wavdec.c
  33. +1
    -0
      libavformat/xwma.c
  34. +2
    -0
      libavresample/options.c
  35. +2
    -0
      libavutil/channel_layout.c
  36. +1
    -0
      libavutil/common.h
  37. +2
    -0
      libavutil/cpu.c

+ 1
- 0
cmdutils.c View File

@@ -20,6 +20,7 @@
*/

#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <errno.h>
#include <math.h>


+ 3
- 0
ffmpeg.c View File

@@ -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"


+ 2
- 0
ffmpeg_filter.c View File

@@ -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"


+ 2
- 0
ffplay.c View File

@@ -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"


+ 1
- 0
libavcodec/aacdec.c View File

@@ -105,6 +105,7 @@
#include <assert.h>
#include <errno.h>
#include <math.h>
#include <stdint.h>
#include <string.h>

#if ARCH_ARM


+ 2
- 0
libavcodec/huffman.c View File

@@ -24,6 +24,8 @@
* huffman tree builder and VLC generator
*/

#include <stdint.h>

#include "avcodec.h"
#include "get_bits.h"
#include "huffman.h"


+ 2
- 0
libavcodec/iff.c View File

@@ -25,6 +25,8 @@
* IFF ACBM/DEEP/ILBM/PBM bitmap decoder
*/

#include <stdint.h>

#include "libavutil/imgutils.h"
#include "bytestream.h"
#include "avcodec.h"


+ 2
- 0
libavcodec/mpeg12enc.c View File

@@ -25,6 +25,8 @@
* MPEG1/2 encoder
*/

#include <stdint.h>

#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
#include "libavutil/log.h"


+ 2
- 0
libavcodec/mpegvideo_enc.c View File

@@ -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"


+ 1
- 0
libavcodec/options_table.h View File

@@ -24,6 +24,7 @@

#include <float.h>
#include <limits.h>
#include <stdint.h>

#include "libavutil/opt.h"
#include "avcodec.h"


+ 1
- 0
libavcodec/parser.c View File

@@ -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"


+ 2
- 0
libavfilter/af_asyncts.c View File

@@ -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"


+ 1
- 0
libavfilter/src_movie.c View File

@@ -28,6 +28,7 @@
*/

#include <float.h>
#include <stdint.h>

#include "libavutil/attributes.h"
#include "libavutil/avstring.h"


+ 1
- 0
libavfilter/trim.c View File

@@ -18,6 +18,7 @@

#include <float.h>
#include <math.h>
#include <stdint.h>

#include "config.h"



+ 1
- 0
libavfilter/vf_fps.c View File

@@ -26,6 +26,7 @@
*/

#include <float.h>
#include <stdint.h>

#include "libavutil/common.h"
#include "libavutil/fifo.h"


+ 2
- 0
libavformat/aiffenc.c View File

@@ -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"


+ 2
- 0
libavformat/assdec.c View File

@@ -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"


+ 2
- 0
libavformat/avidec.c View File

@@ -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"


+ 2
- 0
libavformat/ffmdec.c View File

@@ -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"


+ 1
- 0
libavformat/hlsenc.c View File

@@ -20,6 +20,7 @@
*/

#include <float.h>
#include <stdint.h>

#include "libavutil/mathematics.h"
#include "libavutil/parseutils.h"


+ 2
- 0
libavformat/matroskaenc.c View File

@@ -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"


+ 1
- 0
libavformat/mov.c View File

@@ -24,6 +24,7 @@
*/

#include <limits.h>
#include <stdint.h>

//#define MOV_EXPORT_ALL_METADATA



+ 2
- 0
libavformat/movenc.c View File

@@ -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"


+ 2
- 0
libavformat/mpegenc.c View File

@@ -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"


+ 2
- 0
libavformat/mxfdec.c View File

@@ -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"


+ 2
- 0
libavformat/nutenc.c View File

@@ -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"


+ 2
- 0
libavformat/oggenc.c View File

@@ -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"


+ 2
- 0
libavformat/rl2.c View File

@@ -32,6 +32,8 @@
* optional background_frame
*/

#include <stdint.h>

#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
#include "avformat.h"


+ 3
- 1
libavformat/rpl.c View File

@@ -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


+ 2
- 0
libavformat/seek.c View File

@@ -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"


+ 2
- 0
libavformat/utils.c View File

@@ -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"


+ 2
- 0
libavformat/wavdec.c View File

@@ -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"


+ 1
- 0
libavformat/xwma.c View File

@@ -20,6 +20,7 @@
*/

#include <inttypes.h>
#include <stdint.h>

#include "avformat.h"
#include "internal.h"


+ 2
- 0
libavresample/options.c View File

@@ -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"


+ 2
- 0
libavutil/channel_layout.c View File

@@ -23,6 +23,8 @@
* audio channel layout utility functions
*/

#include <stdint.h>

#include "avstring.h"
#include "avutil.h"
#include "channel_layout.h"


+ 1
- 0
libavutil/common.h View File

@@ -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>


+ 2
- 0
libavutil/cpu.c View File

@@ -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"


Write Preview
Loading…
Cancel
Save