diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 16:01:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 16:02:11 +0100 |
| commit | 726566704f3258b1f4b9fbe2bcb69e1fe752ed09 (patch) | |
| tree | a8b92e14540a5ce95ae31d1cae73eae49e5d425f /libavformat/oggparsevorbis.c | |
| parent | a24aef5dfa5117008c74ee2149346eebe325349d (diff) | |
| parent | 669fe505952f3d8175b1ad6971033a8e8120523b (diff) | |
| download | ffmpeg-726566704f3258b1f4b9fbe2bcb69e1fe752ed09.tar.gz | |
Merge commit '669fe505952f3d8175b1ad6971033a8e8120523b'
* commit '669fe505952f3d8175b1ad6971033a8e8120523b':
twinvq: consume block_align+1 packets as full ones
Conflicts:
libavcodec/twinvq.c
See: 2e7a1fdd6d51aec59931ce7b278b12faa66f98fd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparsevorbis.c')
0 files changed, 0 insertions, 0 deletions