Quoting Vittorio Giovara (2015-12-12 22:02:37) > On Sat, Dec 12, 2015 at 3:49 PM, Anton Khirnov <[email protected]> wrote: > > --- > > libavformat/avformat.h | 11 +++++++++++ > > libavformat/utils.c | 5 +++++ > > 2 files changed, 16 insertions(+) > > > > diff --git a/libavformat/avformat.h b/libavformat/avformat.h > > index cd53420..8f730de 100644 > > --- a/libavformat/avformat.h > > +++ b/libavformat/avformat.h > > @@ -819,6 +819,17 @@ typedef struct AVStream { > > int event_flags; > > #define AVSTREAM_EVENT_FLAG_METADATA_UPDATED 0x0001 ///< The call resulted > > in updated metadata. > > > > + /* > > + * Codec parameters associated with this stream. Allocated and freed by > > + * libavformat in avformat_new_stream() and avformat_free_context() > > + * respectively. > > + * > > + * - demuxing: filled by libavformat on stream creation or in > > + * avformat_find_stream_info() > > + * - muxing: filled by the caller before avformat_write_header() > > + */ > > + AVCodecParameters *codecpar; > > + > > /***************************************************************** > > * All fields below this line are not part of the public API. They > > * may not be used outside of libavformat and can be changed and > > diff --git a/libavformat/utils.c b/libavformat/utils.c > > index 18499af..f6611f0 100644 > > --- a/libavformat/utils.c > > +++ b/libavformat/utils.c > > @@ -2463,6 +2463,7 @@ static void free_stream(AVStream **pst) > > av_freep(&st->internal); > > > > av_dict_free(&st->metadata); > > + avcodec_parameters_free(&st->codecpar); > > av_freep(&st->probe_data.buf); > > av_free(st->index_entries); > > av_free(st->codec->extradata); > > @@ -2573,6 +2574,10 @@ AVStream *avformat_new_stream(AVFormatContext *s, > > const AVCodec *c) > > st->cur_dts = AV_NOPTS_VALUE; > > } > > > > + st->codecpar = avcodec_parameters_alloc(); > > + if (!st->codecpar) > > + goto fail; > > + > > st->index = s->nb_streams; > > st->start_time = AV_NOPTS_VALUE; > > st->duration = AV_NOPTS_VALUE; > > this is going to be squashed with 32? > Could you add a note (also in a separate patch if you wish) in APIChanges?
This is going to be squashed with everything following. There will be a separate patch with bumps and apichanges at the end, so I don't have additional conflicts to resolve each time I rebase. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
