Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Nov 2013 04:21:19 +0000 (05:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Nov 2013 04:21:19 +0000 (05:21 +0100)
commitccdfa3e2711c42b6f8b7902c4dd08f7ac89b4f59
tree752fdf35a10a7d2df7168f59b9d1b49fd7d01a64
parentf67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7
parent8f8bc92365a943e96cc08b5369408c20f35193c7
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:
cmdutils.c
ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavcodec/aacdec.c
libavcodec/huffman.c
libavcodec/iff.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/parser.c
libavfilter/af_asyncts.c
libavfilter/src_movie.c
libavfilter/trim.c
libavfilter/vf_fps.c
libavformat/aiffenc.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/ffmdec.c
libavformat/hlsenc.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/mxfdec.c
libavformat/nutenc.c
libavformat/oggenc.c
libavformat/rl2.c
libavformat/rpl.c
libavformat/seek.c
libavformat/utils.c
libavformat/wavdec.c
libavformat/xwma.c
libavresample/options.c
libavutil/channel_layout.c
libavutil/common.h
libavutil/cpu.c