ffmpeg | branch: release/3.1 | Hendrik Leppkes <h.lepp...@gmail.com> | Thu Jun 30 14:10:42 2016 +0200| [79af094b9304676a2bd83a5172fac97f0d964c1a] | committer: Michael Niedermayer
avformat/utils: update deprecated AVStream->codec when the context is updated This ensures the AVStream->codec entry is kept in sync when new streams are discovered mid-playback or changes to the context occur from other sources. Fixes trac 5678. Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit c2e13d2ecd388bab28e743c34ed146c5ed213fc9) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79af094b9304676a2bd83a5172fac97f0d964c1a --- libavformat/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 6f343f2..d2a709c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1483,6 +1483,15 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; +#if FF_API_LAVF_AVCTX +FF_DISABLE_DEPRECATION_WARNINGS + /* update deprecated public codec context */ + ret = avcodec_parameters_to_context(st->codec, st->codecpar); + if (ret < 0) + return ret; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + st->internal->need_context_update = 0; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
