[FFmpeg-devel] [PATCH] avformat: Copy properties from internal context

[Michael Niedermayer]

On Mon, May 30, 2016 at 02:42:25PM +0200, Hendrik Leppkes wrote:
> On Mon, May 30, 2016 at 2:25 PM, Michael Niedermayer
> <michael at niedermayer.cc> wrote:
> > Fixes Ticket5467 "Lossless j2k information no longer shown"
> >
> > Based on suggestion by Hendrik Leppkes
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/dump.c  |    3 +++
> >  libavformat/utils.c |    3 +++
> >  2 files changed, 6 insertions(+)
> >
> > diff --git a/libavformat/dump.c b/libavformat/dump.c
> > index 9eb6146..e016a37 100644
> > --- a/libavformat/dump.c
> > +++ b/libavformat/dump.c
> > @@ -453,6 +453,9 @@ static void dump_stream_format(AVFormatContext *ic, int i,
> >          return;
> >      }
> >
> > +    // Fields which are missing from AVCodecParameters need to be taken from the AVCodecContext
> > +    avctx->properties = st->codec->properties;
> > +
> >      if (separator)
> >          av_opt_set(avctx, "dump_separator", separator, 0);
> >      avcodec_string(buf, sizeof(buf), avctx, is_output);
> > diff --git a/libavformat/utils.c b/libavformat/utils.c
> > index 47f5ba0..8f0361a 100644
> > --- a/libavformat/utils.c
> > +++ b/libavformat/utils.c
> > @@ -3807,6 +3807,9 @@ FF_DISABLE_DEPRECATION_WARNINGS
> >          }
> >  FF_ENABLE_DEPRECATION_WARNINGS
> >  #endif
> > +        // Fields unavailable in AVCodecParameters
> > +        st->codec->properties = st->internal->avctx->properties;
> > +
> 
> st->codec is deprecated, so it should be in deprecation guards so the
> code doesn't break when the version is bumped.

changed, also added a comment so it doesnt break without people being
aware of when bumping

applied

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Democracy is the form of government in which you can choose your dictator
-------------- 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/20160602/23b80aac/attachment.sig>