diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 16:56:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 16:58:31 +0200 |
| commit | b21b2ca95b3329f9dbbcabd7ade8c1d176a2264b (patch) | |
| tree | 3ae170142da4d3b487721006249bcd133c4291e8 /ffmpeg.h | |
| parent | 488c760091c2497ba7681d2fad8244b941a5b8c7 (diff) | |
| parent | 9526c9ccc3dd9e80ce181d4097b52d4838983096 (diff) | |
| download | ffmpeg-b21b2ca95b3329f9dbbcabd7ade8c1d176a2264b.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Read block_align from extradata when decoding qclp in aiff.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions