h261dec: Fix context initialization sequence

Message ID 20141218212101.EB2585DCB3@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau Dec. 18, 2014, 9:21 p.m.
Module: libav
Branch: master
Commit: 3bb465245fed6069512e6821000391beae8a6066

Author:    Michael Niedermayer <michaelni@gmx.at>
Committer: Martin Storsjö <martin@martin.st>
Date:      Fri Aug 15 02:50:41 2014 +0200

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>

---

 libavcodec/h261dec.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 4d1c997..83cee7f 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -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;