diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 10:48:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 10:59:22 +0200 |
| commit | 17513f4fb3c012bc3147ae33cb2d2c9fc9a6e564 (patch) | |
| tree | 3d5093f5ddd08c9abc79684c683c6334deaee8a9 /libavcodec/h263dec.c | |
| parent | 15d4965239a34756a6317c5c971df77a0c0053d0 (diff) | |
| parent | 8812a8057f539845f6801cafdf6c481a59e96b48 (diff) | |
| download | ffmpeg-17513f4fb3c012bc3147ae33cb2d2c9fc9a6e564.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h263dec: Remove a hack that can cause infinite loops
Conflicts:
libavcodec/h263dec.c
See: d2981b8ef191fc7876e3486e42222ab6a8777c24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 56c4b78550..974acc23c6 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -596,17 +596,6 @@ retry: /* FIXME: By the way H263 decoder is evolving it should have */ /* an H263EncContext */ - if ((!avctx->coded_width || !avctx->coded_height) && 0) { - 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) { |