diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-04 22:33:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-04 22:35:41 +0100 |
| commit | ae4bb6c4884f16474856d7c6537e16999d4b16b1 (patch) | |
| tree | d9e8ab65933dce5b220f2c12486c63d1da4a8f7e /libavcodec/mlpdsp.c | |
| parent | df82125acba5699c74ebe7e1c9293e328e9a9f8a (diff) | |
| parent | 77ab341c0c6cdf2bd437bb48d429e797d1e60da2 (diff) | |
| download | ffmpeg-ae4bb6c4884f16474856d7c6537e16999d4b16b1.tar.gz | |
Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'
* commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2':
aacdec: add default case in channel layout
Conflicts:
libavcodec/aacdec.c
Note, the default case is currently unreachable
See: a48b890392aa22033f182421ba9e3f3b3256461d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlpdsp.c')
0 files changed, 0 insertions, 0 deletions