[FFmpeg-cvslog] h263dec: Remove a hack that can cause infinite loops
Martin Storsjö
git at videolan.org
Tue Oct 8 02:16:59 CEST 2013
ffmpeg | branch: release/1.1 | Martin Storsjö <martin at martin.st> | Mon Sep 23 12:25:48 2013 +0300| [23e42841609739b2e47f040761c9daf1b1a9f291] | committer: Martin Storsjö
h263dec: Remove a hack that can cause infinite loops
The actual usefulness of the hack is not known, and it does cause
infinite loops with some broken input files.
CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 8812a8057f539845f6801cafdf6c481a59e96b48)
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23e42841609739b2e47f040761c9daf1b1a9f291
---
libavcodec/h263dec.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index fc5f565..db58fd2 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -385,8 +385,6 @@ uint64_t time= rdtsc();
}
-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
@@ -569,17 +567,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) {
More information about the ffmpeg-cvslog
mailing list