summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4videodec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-03-28 20:40:40 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-06-05 20:55:09 +0200
commitf730367a60e343f293a997d8ee43aed8c68a6364 (patch)
treecea3167fa771e7a6f8ea0bf6a98f4bcec8868be9 /libavcodec/mpeg4videodec.c
parent87c53e53545fd5f3d27b84f421c53e5a598c1bd8 (diff)
avcodec/mpeg4videodec: Fix default low_delay flag value if not coded
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
-rw-r--r--libavcodec/mpeg4videodec.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 35d182d98e..1fef372b9e 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1754,8 +1754,16 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
} else {
/* is setting low delay flag only once the smartest thing to do?
* low delay detection won't be overridden. */
- if (s->picture_number == 0)
- s->low_delay = 0;
+ if (s->picture_number == 0) {
+ switch(s->vo_type) {
+ case SIMPLE_VO_TYPE:
+ case ADV_SIMPLE_VO_TYPE:
+ s->low_delay = 1;
+ break;
+ default:
+ s->low_delay = 0;
+ }
+ }
}
ctx->shape = get_bits(gb, 2); /* vol shape */