[FFmpeg-cvslog] libavformat/mxfdec.c: Report dark metadata keys only when they match no parser at all, not everytime they fail to match one.

Alexis Ballier git at videolan.org
Thu Oct 22 02:13:25 CEST 2015


ffmpeg | branch: master | Alexis Ballier <aballier at gentoo.org> | Wed Oct 21 18:00:57 2015 +0200| [12628e3369de1dcd6a2de21e089ee007e2cf951a] | committer: Michael Niedermayer

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 at codemill.se>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12628e3369de1dcd6a2de21e089ee007e2cf951a
---

 libavformat/mxfdec.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 02298b5..99c8fed 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)  {



More information about the ffmpeg-cvslog mailing list