summaryrefslogtreecommitdiff
path: root/libavcodec/h263dec.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-23 12:25:48 +0300
committerMartin Storsjö <martin@martin.st>2013-09-23 23:14:49 +0300
commit8812a8057f539845f6801cafdf6c481a59e96b48 (patch)
tree808585e731013f5fb7512a0322b0565e8c7def9d /libavcodec/h263dec.c
parentb6c7bd53f4ba3dd3400f4422b65ee844678c6b72 (diff)
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@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r--libavcodec/h263dec.c13
1 files changed, 0 insertions, 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) {