aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-10-21 18:00:57 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-10-22 00:53:35 +0200
commit12628e3369de1dcd6a2de21e089ee007e2cf951a (patch)
treea79ef13d2d2d00db8fa934f258811f635b6fc2bd
parent94ec82f14ab1c0295f2148ba4c00b71f83745dc5 (diff)
downloadffmpeg-12628e3369de1dcd6a2de21e089ee007e2cf951a.tar.gz
libavformat/mxfdec.c: Report dark metadata keys only when they match no parser at all, not everytime they fail to match one.
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mxfdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 02298b5879..99c8fede02 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -2765,13 +2765,13 @@ static int mxf_read_header(AVFormatContext *s)
if ((ret = mxf_parse_klv(mxf, klv, metadata->read, metadata->ctx_size, metadata->type)) < 0)
goto fail;
break;
- } else {
- av_log(s, AV_LOG_VERBOSE, "Dark key " PRIxUID "\n",
- UID_ARG(klv.key));
}
}
- if (!metadata->read)
+ if (!metadata->read) {
+ av_log(s, AV_LOG_VERBOSE, "Dark key " PRIxUID "\n",
+ UID_ARG(klv.key));
avio_skip(s->pb, klv.length);
+ }
}
/* FIXME avoid seek */
if (!essence_offset) {