[FFmpeg-cvslog] Merge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 01:12:02 2013 +0100| [c122e697fa90c83abfdc729228d736e15a91bcf9] | committer: Michael Niedermayer

Merge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9'

* commit '27245b4e1bbb7a863341db321b5bdc5792e427d9':
  dca: remove embedded downmix coefficient extraction.

Conflicts:
	libavcodec/dcadata.h
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c122e697fa90c83abfdc729228d736e15a91bcf9
---