From: Paul B Mahol Date: Tue, 3 Jul 2012 11:34:33 +0000 (+0000) Subject: jvdec: remove buf_size X-Git-Tag: android-x86-4.4-r1~10869 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1bc9e4c5b27ee07a9e7e1f60e8ec355027f66f64;p=android-x86%2Fexternal-ffmpeg.git jvdec: remove buf_size It is same as avpkt->size. Signed-off-by: Paul B Mahol --- diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index acf1885611..8acd50a45c 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -133,9 +133,8 @@ static int decode_frame(AVCodecContext *avctx, AVPacket *avpkt) { JvContext *s = avctx->priv_data; - int buf_size = avpkt->size; const uint8_t *buf = avpkt->data; - const uint8_t *buf_end = buf + buf_size; + const uint8_t *buf_end = buf + avpkt->size; int video_size, video_type, i, j; video_size = AV_RL32(buf); @@ -143,7 +142,7 @@ static int decode_frame(AVCodecContext *avctx, buf += 5; if (video_size) { - if(video_size < 0 || video_size > buf_size) { + if (video_size < 0 || video_size > avpkt->size) { av_log(avctx, AV_LOG_ERROR, "video size %d invalid\n", video_size); return AVERROR_INVALIDDATA; } @@ -194,7 +193,7 @@ static int decode_frame(AVCodecContext *avctx, *(AVFrame*)data = s->frame; } - return buf_size; + return avpkt->size; } static av_cold int decode_close(AVCodecContext *avctx)