diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 03:01:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 03:20:09 +0200 |
| commit | 94cf83ff91b2380e487211a0444bcd4ac9b58b75 (patch) | |
| tree | 9f7b191c15551537eb2a446c738116b834bfbfb8 /libavformat/vorbiscomment.c | |
| parent | 31876ea620064b00c41ab87c3bb49cf9c6e098eb (diff) | |
| parent | 0a467a9b594dd67aa96bad687d05f8845b009f18 (diff) | |
| download | ffmpeg-94cf83ff91b2380e487211a0444bcd4ac9b58b75.tar.gz | |
Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'
* commit '0a467a9b594dd67aa96bad687d05f8845b009f18':
tiffdec: use bytestream2 to simplify overread/overwrite protection
Conflicts:
libavcodec/tiff.c
See: 1ec83d9a9e472f485897ac92bad9631d551a8c5b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/vorbiscomment.c')
0 files changed, 0 insertions, 0 deletions