Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 00:53:58 +0000 (01:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 02:28:15 +0000 (03:28 +0100)
commit43ec456320d03d34d37f9458b0134d8f9d1ed310
tree98d963a5a8b780f9806c61e1d7850ab924691af9
parentc122e697fa90c83abfdc729228d736e15a91bcf9
parent44b17d794aa508ae21f438ae80bfe8aaf4b426e1
Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'

* commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1':
  dca: extract core substream's embedded downmix coeffcient codes, if present.

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

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