diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:14:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:14:02 +0200 |
| commit | 7c520e5cd61a59ef2e243630ae407e274b8d84b9 (patch) | |
| tree | 53391fa2c33cb89b7b119f6b73e32dbc9b17f008 /libavcodec/pngdec.c | |
| parent | d076ee521647d9851c92840ec9eb82d4e0dedac9 (diff) | |
| parent | 71b8c8430cf3f7056849257324fc39b423075ba1 (diff) | |
| download | ffmpeg-7c520e5cd61a59ef2e243630ae407e274b8d84b9.tar.gz | |
Merge commit '71b8c8430cf3f7056849257324fc39b423075ba1' into release/0.10
* commit '71b8c8430cf3f7056849257324fc39b423075ba1':
sgidec: fix buffer size check in expand_rle_row()
adx: check that the offset is not negative
mpegvideo: set reference/pict_type on generated reference frames
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdec.c')
0 files changed, 0 insertions, 0 deletions