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

Tomas Härdin tomas.hardin at codemill.se
Wed Oct 21 23:31:48 CEST 2015


On Wed, 2015-10-21 at 18:00 +0200, Alexis Ballier wrote:
> ---
>  libavformat/mxfdec.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
> index 0ae7ce6..593604e 100644
> --- a/libavformat/mxfdec.c
> +++ b/libavformat/mxfdec.c
> @@ -2767,13 +2767,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)  {

Seems fine

/Tomas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20151021/ecc74364/attachment.sig>


More information about the ffmpeg-devel mailing list