diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 01:53:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 03:28:15 +0100 |
| commit | 43ec456320d03d34d37f9458b0134d8f9d1ed310 (patch) | |
| tree | 98d963a5a8b780f9806c61e1d7850ab924691af9 /libavcodec/aacpsdata.c | |
| parent | c122e697fa90c83abfdc729228d736e15a91bcf9 (diff) | |
| parent | 44b17d794aa508ae21f438ae80bfe8aaf4b426e1 (diff) | |
| download | ffmpeg-43ec456320d03d34d37f9458b0134d8f9d1ed310.tar.gz | |
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>
Diffstat (limited to 'libavcodec/aacpsdata.c')
0 files changed, 0 insertions, 0 deletions