diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 19:23:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 19:23:34 +0200 |
| commit | 120028968749cc65cc8eea491004d64bd5179487 (patch) | |
| tree | 99928091d96252b50fd99a229dfa2143d967c08c /libavcodec/mips/amrwbdec_mips.c | |
| parent | 6034b4bb88c1e5fc47fe2c2ff81835cb3dd4e872 (diff) | |
| parent | 0289f81241e720452b5a77713488d54d3ec252d7 (diff) | |
| download | ffmpeg-120028968749cc65cc8eea491004d64bd5179487.tar.gz | |
Merge commit '0289f81241e720452b5a77713488d54d3ec252d7'
* commit '0289f81241e720452b5a77713488d54d3ec252d7':
aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE
Conflicts:
libavcodec/aacdec.c
Sample: 5.1ch_PCE_issue.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mips/amrwbdec_mips.c')
0 files changed, 0 insertions, 0 deletions