diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-29 04:40:34 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-29 04:40:34 +0400 |
| commit | 6071e4d87a9b257c3f7b5912825ede9caa757624 (patch) | |
| tree | aeaad3a1d7eb0b27f20a66665740d2a96e99f7c2 /libavcodec/v410dec.c | |
| parent | 7e5cbb3c2d96c27d526aa69cbdbd1ab23739d7e5 (diff) | |
| parent | 8f5216905f88510c9a74cd91a424902aa989b9a1 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Check for sufficient input data. Fixes crash
fate: Add v210 codec regression tests
mpegts: adjustable minimum PES payload
mpegts: properly output large audio packets
avformat: Add SMJPEG demuxer.
Indeo 4 decoder
Conflicts:
doc/general.texi
libavcodec/v410dec.c
libavcodec/version.h
libavformat/mpegtsenc.c
libavformat/smjpeg.c
libavformat/version.h
tests/codec-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/v410dec.c')
| -rw-r--r-- | libavcodec/v410dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index dfd1273012..6ea43addc3 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -55,7 +55,7 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data, if (pic->data[0]) avctx->release_buffer(avctx, pic); - if (avpkt->size < 4*avctx->height*avctx->width) { + if (avpkt->size < 4 * avctx->height * avctx->width) { av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n"); return AVERROR(EINVAL); } |