diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-29 23:24:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-29 23:24:27 +0200 |
| commit | 2f8418b584d2e3d742b6c1c3b320e37c55a3df95 (patch) | |
| tree | 3b6e899c5a5bd420e8074ae02c20f94262d14aac /libavcodec/jpeglsdec.c | |
| parent | 9e58d46edf95e5da585e613b22e1255cf279b5cf (diff) | |
| parent | 28ff439efd2362fb21e1a78610737f2e26a72d8f (diff) | |
| download | ffmpeg-2f8418b584d2e3d742b6c1c3b320e37c55a3df95.tar.gz | |
Merge commit '28ff439efd2362fb21e1a78610737f2e26a72d8f'
* commit '28ff439efd2362fb21e1a78610737f2e26a72d8f':
mvi: Add sanity checking for the audio frame size
Conflicts:
libavformat/mvi.c
See: ea1d8465e6eca582c09e2526f677033b62576fda
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.c')
0 files changed, 0 insertions, 0 deletions