diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 01:30:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 01:31:15 +0200 |
| commit | 476692abdb3207b722c2cbbd9ea3720004aae440 (patch) | |
| tree | e8b6239290da2a3583e6ea7a05e27b15290a6d8b /libavcodec/smvjpegdec.c | |
| parent | 8eb2c411c1e56be522cce65b8acf92dd8b9fbfdd (diff) | |
| parent | a188108ebf28ebac9d2b8fc7d5b391aef45698b3 (diff) | |
| download | ffmpeg-476692abdb3207b722c2cbbd9ea3720004aae440.tar.gz | |
Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'
* commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3':
aac: Support channel configurations 11 and 12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smvjpegdec.c')
0 files changed, 0 insertions, 0 deletions