From patchwork Tue Sep 27 01:57:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 744 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2221209vsd; Mon, 26 Sep 2016 18:59:00 -0700 (PDT) X-Received: by 10.28.66.6 with SMTP id p6mr581518wma.59.1474941540417; Mon, 26 Sep 2016 18:59:00 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cb5si3432384wjc.92.2016.09.26.18.58.59; Mon, 26 Sep 2016 18:59:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B25D7689E7D; Tue, 27 Sep 2016 04:58:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f66.google.com (mail-oi0-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44D74689E6D for ; Tue, 27 Sep 2016 04:58:33 +0300 (EEST) Received: by mail-oi0-f66.google.com with SMTP id n202so14710671oig.2 for ; Mon, 26 Sep 2016 18:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=SMu4iqe6SKYwZlZ+DVWHJvEbCvSK++pDeshkzi9azRE=; b=KyiR5tfhqa6SFk2L+O757ZjMtC4OIpZAAD4c3KqyTpvqJBsvL5WLUYCfAvNSYTNgUR 5j38gr65QwWPGWpjGF4VkbdChXps5rmVcLyP2nJtSSZnS9IyWWImtTbjGkXgpbBRwWzN G3s3LkOSbAdfhaQlpmSB8KHUeLjZzs+8NFI1KglJGwYomBrA/iOaV9tLQsvH/0vbARPu 7RWAU1u3MlZiY9NWwn9mSIpiQFD4O/2bt3IuwGYWbfppMQL8XfMdXuAUsKU7LW6B66lR byrEpKUg93dmvl2DNORr7DvCSLGj5n/CRh/c1o4wOhLGu7vo2aSmAlGT6jqvGl4m88sI z8xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=SMu4iqe6SKYwZlZ+DVWHJvEbCvSK++pDeshkzi9azRE=; b=L4HjNtxf4mjkOgiROACyXf7LaSlVAFKHe6dC2JpLFdN+loq8mn/FilhBvLovV+M7OR NxvH77E0vojgXkgH+wYzT5BukMECkpD98MqT55SATbQuQAUa+hX5hG4BCxmzzI3WyZOh WhEuTczChkn3Gh7gp6LhuqxQvt9Rrdu2/zYRedCDJEiMrxrOyc4JnmkbWLVgobWkZN74 Nd2BgVJy0MhsJLRne4LeBdj4296NmoDoSHNgTVtOS4RxjnpbB5+RyZ4f/uvbzpp1+IMJ AaWgi3Tfe/y8tIzRtNYhJz88YqsiwLnq+335E+iUVrKkAUbaBfFcuIe0G0lz0I3KgvTO W5yQ== X-Gm-Message-State: AE9vXwP5R4HHl1fwR5msbnb01k4dqJwLtEzeIIlfvEomOq5KXqG50MSy3MB/vgNnZsua3A== X-Received: by 10.202.79.21 with SMTP id d21mr30238281oib.141.1474941529364; Mon, 26 Sep 2016 18:58:49 -0700 (PDT) Received: from localhost.localdomain ([181.22.0.151]) by smtp.gmail.com with ESMTPSA id j10sm8170721ote.37.2016.09.26.18.58.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Sep 2016 18:58:48 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2016 22:57:33 -0300 Message-Id: <20160927015733.6820-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 Subject: [FFmpeg-devel] [PATCH] ffprobe: don't use AVStream.codec to set decoder framerate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also don't set time_base. It's deprecated for decoding and avcodec_open2() will overwrite it Signed-off-by: James Almer --- 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",