diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 11:42:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 11:46:28 +0200 |
| commit | 0c6f382e855749ec45224a74ba5e07d1db52e6a0 (patch) | |
| tree | be5d6955e36e7be80653de19cc91871b727f461e /libavcodec/idcinvideo.c | |
| parent | 5f312139dff4072c3482a0b01daafcc1446d70c8 (diff) | |
| parent | 62b1e3b1031e901105d78e831120de8e4c3e0013 (diff) | |
| download | ffmpeg-streaming-0c6f382e855749ec45224a74ba5e07d1db52e6a0.zip ffmpeg-streaming-0c6f382e855749ec45224a74ba5e07d1db52e6a0.tar.gz | |
Merge commit '62b1e3b1031e901105d78e831120de8e4c3e0013'
* commit '62b1e3b1031e901105d78e831120de8e4c3e0013':
aasc: Check minimum buffer size
Conflicts:
libavcodec/aasc.c
See: e1631f8ebe9a8f2a9cca85d60160b9be94eb63f3
See: 8a57ca5c6a1c0ad28afa7ea6f824981e6761cce1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/idcinvideo.c')
0 files changed, 0 insertions, 0 deletions
