diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:22:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:22:30 +0100 |
| commit | 7a6907fcc33498e7b323f87e29c7e223304c1141 (patch) | |
| tree | 6ee49e52e0d304bbb9831e6b0eb091851b791ad6 /libavcodec/adpcm_data.c | |
| parent | 74e52afe8f8ac02e66cf174ef052f2266130162f (diff) | |
| parent | ce424e57d629072652935501b439c1a6310c2089 (diff) | |
| download | ffmpeg-7a6907fcc33498e7b323f87e29c7e223304c1141.tar.gz | |
Merge commit 'ce424e57d629072652935501b439c1a6310c2089' into release/1.1
* commit 'ce424e57d629072652935501b439c1a6310c2089':
mp3enc: fix a triggerable assert
Conflicts:
libavformat/mp3enc.c
Changed code is not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm_data.c')
0 files changed, 0 insertions, 0 deletions