From 8812a8057f539845f6801cafdf6c481a59e96b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 23 Sep 2013 12:25:48 +0300 Subject: [PATCH] h263dec: Remove a hack that can cause infinite loops MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The actual usefulness of the hack is not known, and it does cause infinite loops with some broken input files. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavcodec/h263dec.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 7f90862b36..24a48b3730 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -379,8 +379,6 @@ int ff_h263_decode_frame(AVCodecContext *avctx, } -retry: - if(s->bitstream_buffer_size && (s->divx_packed || buf_size<20)){ //divx 5.01+/xvid frame reorder init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8); }else @@ -563,17 +561,6 @@ retry: /* FIXME: By the way H263 decoder is evolving it should have */ /* an H263EncContext */ - if (!avctx->coded_width || !avctx->coded_height) { - ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat - - s->parse_context.buffer=0; - ff_MPV_common_end(s); - s->parse_context= pc; - avcodec_set_dimensions(avctx, s->width, s->height); - - goto retry; - } - if (s->width != avctx->coded_width || s->height != avctx->coded_height || s->context_reinit) {