[FFmpeg-cvslog] ffprobe: don't use AVStream.codec to set decoder framerate

James Almer git at videolan.org
Wed Sep 28 03:23:29 EEST 2016


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Sep 26 22:56:52 2016 -0300| [92de2c23a61e5a8d8ced28b4697cae395f35e46c] | committer: James Almer

ffprobe: don't use AVStream.codec to set decoder framerate

Also don't set time_base. It's deprecated for decoding and avcodec_open2()
will overwrite it

Reviewed-by: Josh de Kock <josh at itanimul.li>
Signed-off-by: James Almer <jamrial at gmail.com>

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

 ffprobe.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index b59f11e..bb3979c 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -2612,10 +2612,7 @@ static int open_input_file(InputFile *ifile, const char *filename)
                 exit(1);
 
             av_codec_set_pkt_timebase(ist->dec_ctx, stream->time_base);
-#if FF_API_LAVF_AVCTX
-            ist->dec_ctx->time_base = stream->codec->time_base;
-            ist->dec_ctx->framerate = stream->codec->framerate;
-#endif
+            ist->dec_ctx->framerate = stream->avg_frame_rate;
 
             if (avcodec_open2(ist->dec_ctx, codec, &opts) < 0) {
                 av_log(NULL, AV_LOG_WARNING, "Could not open codec for input stream %d\n",



More information about the ffmpeg-cvslog mailing list