From 55ebf707d0abf720a2b02fc5ebc47eb742bfbe99 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Fri, 19 Jan 2018 15:52:21 -0300
Subject: [PATCH] avcodec/mlp_parser: don't try to combine frames when full
frames are provided
Attempting full frame reconstruction is unnecessary for non raw
containers, so just skip it altogether.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/mlp_parser.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index 3c0330f777c..4827354f189 100644
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -256,6 +256,9 @@ static int mlp_parse(AVCodecParserContext *s,
if (buf_size == 0)
return 0;
+ if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
+ next = buf_size;
+ } else {
if (!mp->in_sync) {
// Not in sync - find a major sync header
@@ -315,6 +318,7 @@ static int mlp_parse(AVCodecParserContext *s,
}
mp->bytes_left = 0;
+ }
sync_present = (AV_RB32(buf + 4) & 0xfffffffe) == 0xf8726fba;
--
GitLab