ffmpeg/libswresample
Michael Niedermayer 15a0fb58a3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  utvideodec: Fix single symbol mode decoding
  truespeech: drop useless casts
  libavcodec: drop bogus dependencies from mpc[78] and qdm2
  mpegaudio: move ff_mpa_enwindow to a separate file
  AVOptions: store defaults for INT64 options in int64 union member.

Conflicts:
	libavcodec/Makefile
	libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-24 15:00:39 +02:00
..
x86
Makefile
audioconvert.c
audioconvert.h
dither.c
libswresample.v
rematrix.c
rematrix_template.c
resample.c
resample_template.c
swresample-test.c
swresample.c
swresample.h
swresample_internal.h