[FFmpeg-cvslog] avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id check

Michael Niedermayer git at videolan.org
Sat Nov 30 02:50:03 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 02:35:13 2013 +0100| [b239f3f69d1c10a7d12354a9038c5b109661324e] | committer: Michael Niedermayer

avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id check

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b239f3f69d1c10a7d12354a9038c5b109661324e
---

 libavcodec/h263dec.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 9dc391a..afd2d77 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -491,8 +491,10 @@ retry:
 
     avctx->has_b_frames = !s->low_delay;
 
-    if (ff_mpeg4_workaround_bugs(avctx) == 1)
-        goto retry;
+    if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) {
+        if (ff_mpeg4_workaround_bugs(avctx) == 1)
+            goto retry;
+    }
 
     /* After H263 & mpeg4 header decode we have the height, width,
      * and other parameters. So then we could init the picture.



More information about the ffmpeg-cvslog mailing list