diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 01:12:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 01:12:02 +0100 |
| commit | c122e697fa90c83abfdc729228d736e15a91bcf9 (patch) | |
| tree | 18a85532a0f9cfb4ecff36a6cf764924f20f53d5 /libavcodec/gsmdec_template.c | |
| parent | a7f8817720ea04ab9abf16a5b9d493d6a762cd8a (diff) | |
| parent | 27245b4e1bbb7a863341db321b5bdc5792e427d9 (diff) | |
| download | ffmpeg-c122e697fa90c83abfdc729228d736e15a91bcf9.tar.gz | |
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>
Diffstat (limited to 'libavcodec/gsmdec_template.c')
0 files changed, 0 insertions, 0 deletions