Browse code

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>

Alexis Ballier authored on 2015/10/22 01:00:57
Showing 1 changed files
... ...
@@ -2765,13 +2765,13 @@ static int mxf_read_header(AVFormatContext *s)
2765 2765
                 if ((ret = mxf_parse_klv(mxf, klv, metadata->read, metadata->ctx_size, metadata->type)) < 0)
2766 2766
                     goto fail;
2767 2767
                 break;
2768
-            } else {
2769
-                av_log(s, AV_LOG_VERBOSE, "Dark key " PRIxUID "\n",
2770
-                       UID_ARG(klv.key));
2771 2768
             }
2772 2769
         }
2773
-        if (!metadata->read)
2770
+        if (!metadata->read) {
2771
+            av_log(s, AV_LOG_VERBOSE, "Dark key " PRIxUID "\n",
2772
+                            UID_ARG(klv.key));
2774 2773
             avio_skip(s->pb, klv.length);
2774
+        }
2775 2775
     }
2776 2776
     /* FIXME avoid seek */
2777 2777
     if (!essence_offset)  {