Browse Source

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: Martin Storsjö <martin@martin.st>
tags/n2.6
Michael Niedermayer Martin Storsjö 11 years ago
parent
commit
3bb465245f
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavcodec/h261dec.c

+ 1
- 2
libavcodec/h261dec.c View File

@@ -600,11 +600,10 @@ retry:
s->parse_context = pc;
}

if (!s->context_initialized)
if (!s->context_initialized) {
if ((ret = ff_mpv_common_init(s)) < 0)
return ret;

if (!s->context_initialized) {
ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;


Loading…
Cancel
Save