OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b1922d
)
avcodec/h263dec: move call to ff_mpeg4_workaround_bugs() under codec_id check
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Nov 2013 01:35:13 +0000
(
02:35
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 Nov 2013 01:35:13 +0000
(
02:35
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/h263dec.c
b/libavcodec/h263dec.c
index
9dc391a
..
afd2d77
100644
(file)
--- 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.