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 Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
Makefile buildsys: fix rules for swresample-test 2012-06-05 17:27:38 +02:00
audioconvert.c
audioconvert.h swr: add int16_to_int32_mmx/sse 2012-04-28 13:15:44 +02:00
dither.c
libswresample.v
rematrix.c swr: fix warning: passing argument 2 of s->mix_any_f from incompatible pointer type 2012-07-02 17:33:27 +02:00
rematrix_template.c
resample.c
resample_template.c
swresample-test.c
swresample.c
swresample.h
swresample_internal.h swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00