diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 16:44:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 16:46:59 +0200 |
| commit | b34afd94ec908c051e1d76be331544e9f425bdcf (patch) | |
| tree | 8702a4c008b513ab4c12fdda28657be0f8b148d0 /libavcodec/imgconvert.c | |
| parent | 1c14b09caf903f2e776dcd661085db49511bf531 (diff) | |
| parent | bac0850fbf870d4354d0f68840c0b1c9c1425c4a (diff) | |
| download | ffmpeg-b34afd94ec908c051e1d76be331544e9f425bdcf.tar.gz | |
Merge commit 'bac0850fbf870d4354d0f68840c0b1c9c1425c4a' into release/2.2
* commit 'bac0850fbf870d4354d0f68840c0b1c9c1425c4a':
matroskadec: fix crash when parsing invalid mkv
Conflicts:
libavformat/matroskadec.c
See: d9fe6b926cd619c311e45e0ae352cf09713c482c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
0 files changed, 0 insertions, 0 deletions