Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Aug 2012 12:51:51 +0000 (14:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Aug 2012 13:00:39 +0000 (15:00 +0200)
commit15a0fb58a3294876c23989915a4a6202411be1b0
tree06270e6af9c4d446b75a573b39161664e60c6a13
parentbec180e1127f6753b5af1e6e5242020e0de12366
parent01cb4c84f54a52725c9b4b4dd6c609c36cccc5d4
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>
15 files changed:
libavcodec/Makefile
libavcodec/mpegaudiodata.c
libavcodec/mpegaudiodata.h
libavcodec/mpegaudiodsp.h
libavcodec/mpegaudiodsp_data.c
libavcodec/mpegaudiodsp_template.c
libavcodec/mpegaudioenc.c
libavcodec/options.c
libavcodec/options_table.h
libavcodec/truespeech.c
libavcodec/utvideodec.c
libavfilter/af_asyncts.c
libavfilter/vf_drawtext.c
libavutil/opt.c
libswresample/swresample.c