ffprobe: don't use AVStream.codec to set decoder framerate
authorJames Almer <jamrial@gmail.com>
Tue, 27 Sep 2016 01:56:52 +0000 (22:56 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 00:21:42 +0000 (21:21 -0300)
Also don't set time_base. It's deprecated for decoding and avcodec_open2()
will overwrite it

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

index b59f11e..bb3979c 100644 (file)
--- 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",