ffmpeg/libavresample
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
..
arm
x86
Makefile
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix.c
audio_mix.h
audio_mix_matrix.c
avresample-test.c
avresample.h
dither.c
dither.h
internal.h
libavresample.v
options.c
resample.c
resample.h
resample_template.c
utils.c
version.h