mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h263dec: Remove a hack that can cause infinite loops
Conflicts:
libavcodec/h263dec.c
See: d2981b8ef1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
17513f4fb3
|
@ -596,17 +596,6 @@ retry:
|
||||||
/* FIXME: By the way H263 decoder is evolving it should have */
|
/* FIXME: By the way H263 decoder is evolving it should have */
|
||||||
/* an H263EncContext */
|
/* 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 ||
|
if (s->width != avctx->coded_width ||
|
||||||
s->height != avctx->coded_height ||
|
s->height != avctx->coded_height ||
|
||||||
s->context_reinit) {
|
s->context_reinit) {
|
||||||
|
|
Loading…
Reference in New Issue