Commit 3bb46524 authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Martin Storsjö

h261dec: Fix context initialization sequence

ff_mpv_common_init sets s->context_initialized.

This fixes decoding of h261 in the cases where the demuxer
hasn't already set the frame size.

CC: libav-stable@libav.org
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 91bfac75
...@@ -600,11 +600,10 @@ retry: ...@@ -600,11 +600,10 @@ retry:
s->parse_context = pc; s->parse_context = pc;
} }
if (!s->context_initialized) if (!s->context_initialized) {
if ((ret = ff_mpv_common_init(s)) < 0) if ((ret = ff_mpv_common_init(s)) < 0)
return ret; return ret;
if (!s->context_initialized) {
ret = ff_set_dimensions(avctx, s->width, s->height); ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment