diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 13:18:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 13:18:27 +0200 |
| commit | a88ed5a481c365b9ca95588aeee6d9858ad5df40 (patch) | |
| tree | ca46f1fab490703d6ffc7cdb68478e97b947fd90 /libavcodec/g726.c | |
| parent | f33d5af1f35e1f1fd83648d321b489c9006525c9 (diff) | |
| parent | b64bd2e18bac1bd3e3e0ae4aebcad1c33f031c66 (diff) | |
| download | ffmpeg-a88ed5a481c365b9ca95588aeee6d9858ad5df40.tar.gz | |
Merge commit 'b64bd2e18bac1bd3e3e0ae4aebcad1c33f031c66' into release/0.10
* commit 'b64bd2e18bac1bd3e3e0ae4aebcad1c33f031c66':
qdm2: refactor joined stereo support
adpcm: Write the correct number of samples for ima-dk4
imc: Catch a division by zero
atrac3: Error on impossible encoding/channel combinations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g726.c')
0 files changed, 0 insertions, 0 deletions