Merge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 00:12:02 +0000 (01:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 00:12:02 +0000 (01:12 +0100)
commitc122e697fa90c83abfdc729228d736e15a91bcf9
tree18a85532a0f9cfb4ecff36a6cf764924f20f53d5
parenta7f8817720ea04ab9abf16a5b9d493d6a762cd8a
parent27245b4e1bbb7a863341db321b5bdc5792e427d9
Merge commit '27245b4e1bbb7a863341db321b5bdc5792e427d9'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadata.h
libavcodec/dcadec.c