diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 17:06:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 17:06:03 +0200 |
| commit | 63b38d4a91818c6aa6e842c9df7f27362b1223fa (patch) | |
| tree | fa474d47316827c74fd9c1301e01b9cca4b10d7a /libavcodec/v210enc.c | |
| parent | 260f37ee4d036f61633ccaf03e5d96f448d723ea (diff) | |
| parent | 85b8b169175a55fc862e01ecc96f649374bc14d2 (diff) | |
| download | ffmpeg-63b38d4a91818c6aa6e842c9df7f27362b1223fa.tar.gz | |
Merge commit '85b8b169175a55fc862e01ecc96f649374bc14d2' into release/1.1
* commit '85b8b169175a55fc862e01ecc96f649374bc14d2':
tiffdec: use bytestream2 to simplify overread/overwrite protection
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/v210enc.c')
0 files changed, 0 insertions, 0 deletions