Michael Niedermayer ccdfa3e271 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>

2013-11-24 05:21:19 +01:00

9.8 KiB

Raw Blame History

View Raw