[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.

[Michael Niedermayer]

On Wed, Oct 21, 2015 at 11:31:48PM +0200, Tomas Härdin wrote:
> 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

applied

thanks

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No great genius has ever existed without some touch of madness. -- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20151022/9864f0d1/attachment.sig>