ffmpeg | branch: release/3.1 | Michael Niedermayer <mich...@niedermayer.cc> | 
Sat Oct  8 17:49:10 2016 +0200| [08eef74a39d73bec80d4a12f0eaca6a3602a2024] | 
committer: Michael Niedermayer

avformat/utils: Update codec_id before using it in the parser init

Fixes assertion failure

Fixes: input.avi

Found-by: 连一汉 <lianyi...@360.cn>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 987690799dd86433bf98b897aaa4c8d93ade646d)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08eef74a39d73bec80d4a12f0eaca6a3602a2024
---

 libavformat/utils.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5be1e86..8dc287f 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3328,6 +3328,17 @@ int avformat_find_stream_info(AVFormatContext *ic, 
AVDictionary **options)
             if (!avctx->time_base.num)
                 avctx->time_base = st->time_base;
         }
+
+        /* check if the caller has overridden the codec id */
+#if FF_API_LAVF_AVCTX
+FF_DISABLE_DEPRECATION_WARNINGS
+        if (st->codec->codec_id != st->internal->orig_codec_id) {
+            st->codecpar->codec_id   = st->codec->codec_id;
+            st->codecpar->codec_type = st->codec->codec_type;
+            st->internal->orig_codec_id = st->codec->codec_id;
+        }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
         // only for the split stuff
         if (!st->parser && !(ic->flags & AVFMT_FLAG_NOPARSE) && 
st->request_probe <= 0) {
             st->parser = av_parser_init(st->codecpar->codec_id);
@@ -3344,16 +3355,6 @@ int avformat_find_stream_info(AVFormatContext *ic, 
AVDictionary **options)
             }
         }
 
-        /* check if the caller has overridden the codec id */
-#if FF_API_LAVF_AVCTX
-FF_DISABLE_DEPRECATION_WARNINGS
-        if (st->codec->codec_id != st->internal->orig_codec_id) {
-            st->codecpar->codec_id   = st->codec->codec_id;
-            st->codecpar->codec_type = st->codec->codec_type;
-            st->internal->orig_codec_id = st->codec->codec_id;
-        }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
         if (st->codecpar->codec_id != st->internal->orig_codec_id)
             st->internal->orig_codec_id = st->codecpar->codec_id;
 

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to