summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-30 02:35:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-30 02:35:13 +0100
commitb239f3f69d1c10a7d12354a9038c5b109661324e (patch)
treecc905e69134523fe1140ea482c677f7efa6ade5f /libavcodec
parent2b1922d9641012a01eee144a4410f5e94ccfbec7 (diff)
avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h263dec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 9dc391ab14..afd2d779db 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.