diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-11 02:39:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-11 03:42:43 +0200 |
| commit | 41f55277fafeec4f1b3202967bd0ab120948dd69 (patch) | |
| tree | f239ff85401c38aa12a243384bdaf2ad48afaffb /libavcodec/ptx.c | |
| parent | fbb8468f205aa118b3701db56b134f3f173a13ad (diff) | |
| parent | 4c7a232fc81fdbdee279ab819a255f624a22b083 (diff) | |
| download | ffmpeg-41f55277fafeec4f1b3202967bd0ab120948dd69.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (34 commits)
h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
error_resilience: fix the check for missing references in ff_er_frame_end() for H264
4xm: prevent NULL dereference with invalid huffman table
4xmdemux: prevent use of uninitialized memory
4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
ptx: check for out of bound reads
tiffdec: fix out of bound reads/writes
eacmv: check for out of bound reads
eacmv: fix potential pointer arithmetic overflows
adpcm: fix out of bound reads due to integer overflow
anm: prevent infinite loop
avsdemux: check for out of bound writes
avs: check for out of bound reads
avsdemux: check for corrupted data
AVOptions: refactor set_number/write_number
AVOptions: cosmetics, rename static av_set_number2() to write_number().
AVOptions: cosmetics, move and rename static av_set_number().
AVOptions: split av_set_string3 into opt type-specific functions
avidec: fix signed overflow in avi_sync()
mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
...
Conflicts:
Changelog
configure
libavcodec/ptx.c
libavcodec/ra144.c
libavcodec/vaapi_vc1.c
libavcodec/vc1.c
libavcodec/version.h
libavformat/4xm.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ptx.c')
| -rw-r--r-- | libavcodec/ptx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 4e5453e715..fb457f234a 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -60,7 +60,6 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, avctx->pix_fmt = PIX_FMT_RGB555; - if (buf_end - buf < offset) return AVERROR_INVALIDDATA; if (offset != 0x2c) |