From patchwork Mon Jun 1 14:57:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Foss X-Patchwork-Id: 20058 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2AF5944A924 for ; Mon, 1 Jun 2020 18:26:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AC2A6881BA; Mon, 1 Jun 2020 18:26:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f74.google.com (mail-vs1-f74.google.com [209.85.217.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9671687F65 for ; Mon, 1 Jun 2020 18:26:15 +0300 (EEST) Received: by mail-vs1-f74.google.com with SMTP id u123so35466vsb.2 for ; Mon, 01 Jun 2020 08:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=bY58y4Gh4fUZPv0EJzCD6TJQoeEAShFPx87v4cPNGg0=; b=pJFXP0dwSOyx1a1w4tH8FKLXRU3m32sWi2H6vCF6BaU57nCPNJbVA3kNnPxap71Ooq 5EzqiR+ugEG+eziLeV4b1VufNtjuf6srrzjU04Xa47gYA//GhSpOrotPLUztBZCHfmzq SKCfRlv56kqIPRVJPwt0x7lEFDeUku0/cCc+mPxl9k/tRV147oIF0K2vCfOYQDfbPZH8 aeuPdABO/rqYRcDCWsAJ37TCGaKm6CT9ZBGZ0Y9r5Ekj+rml3SHjNQt3e0JoBEy21+w1 hZdDPF7wqKPnZvMxfr6dB0VlHL6NnL06xWTMMM0RlxmFLX5+AkSSCeJpuNUMul/TxXaR KFNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=bY58y4Gh4fUZPv0EJzCD6TJQoeEAShFPx87v4cPNGg0=; b=mmrJfus+4myBKhE4SBb57WAhRFfjH0kx+zSXcuWOW0RptWhU9h6Vq4AbQ+fIh0ebSC IbcGdem/yHeUaLz+3Fbm19fvSAJiCu1nGDeDvSW4UKZXyC1PVaK40VfnjjUlEeJDwhAd 4qRLtbxFuJ+ObYlrBKMavBI5pNcT5iwCcAT9K/hKVt8qVLPhM4KYaxoccBPa9Dez1f2W 290LdrnpA4DsbdsvRtqeKf9FU8L/hAtamC/TGmy9/mQc5C4mT13sTVrKAF9H3GKht4fi ROFF8BllCxPqefZxlh52NnYLDchelD0RALRe+aXr7MGycb8YRpXI++Kc7Oio+gFZ1lvz 6v6A== X-Gm-Message-State: AOAM532C+crsoytengq8vkc0NOw9D3jHGmTq4AI/1lx4ZZFKrYUbcq/O AXdvpg1hB930puV0hOnzo/8t+l9vMnY9kUQrjgJ8xav3NcCFlbM/we4y0PG8CHFvjcO25LeCtKp fdcULKCq5rtwo1mr5jEMGwWquCOvB1+GOwOs3cqFczUa4WdfrAuAWf4SHlHkP X-Google-Smtp-Source: ABdhPJxhOeM4iUlp0oZui69VBcIM7SKeK8UM9igqx9RtukRCpF4VV7+zBaEbZXBybac5XNmm3nNdBfp2YQ== X-Received: by 2002:ad4:424f:: with SMTP id l15mr5674865qvq.94.1591023431173; Mon, 01 Jun 2020 07:57:11 -0700 (PDT) Date: Mon, 1 Jun 2020 10:57:08 -0400 Message-Id: <20200601145708.202297-1-sfoss@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.27.0.rc2.251.g90737beb825-goog From: sfoss To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avformat: Find a fallback probe decoder that will also match a forced decoder's codec. 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 Cc: sfoss Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Prevent codecpar->codec_id from getting out of sync with the codec instantiated for probing. --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index c9385318f6..b3d902c6b5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -219,7 +219,7 @@ static const AVCodec *find_probe_decoder(AVFormatContext *s, const AVStream *st, const AVCodec *probe_codec = NULL; void *iter = NULL; while ((probe_codec = av_codec_iterate(&iter))) { - if (probe_codec->id == codec_id && + if (probe_codec->id == codec->id && av_codec_is_decoder(probe_codec) && !(probe_codec->capabilities & (AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_EXPERIMENTAL))) { return probe_codec;