From patchwork Mon Apr 19 14:10:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27050 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp565603iob; Mon, 19 Apr 2021 07:23:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHLNjbB1vhZLBs0MBp+mZgAm+epfA+gnwmUp9Tik/KxILJwHrYosNA0uLkp3w1l+5PU6E0 X-Received: by 2002:a05:6402:22f9:: with SMTP id dn25mr25692097edb.171.1618842204522; Mon, 19 Apr 2021 07:23:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842204; cv=none; d=google.com; s=arc-20160816; b=TjoHOTEiA+6463eb1mcir1snNmxk6scYD2163NXrEn46iUXZw1XgUtaK4ISs6T6WZ2 sxNawOC2e98uAT3TqmWQp4HZOdhKwCA6jsvmHl/dDXcUvO2q40/1hEGFmbGwh0A2jH2X bbvlXgF6fID8SBbU0QmD+1ra1+3t5fdwCr/8zn/bTd4cD8vDGRT5a657afPupJpiy358 vQZLBEngpmEHUKJjetehumQcoZCDGbtxL1iqF0WamKSRWLWNgFIMA9BaiZr1Ri1NF1MX qTk9innVM9oKX/BHbRll4UrEht+uEMRi80OLBnPRZWMSAKOhN6e8d1BEBz7jkbQ6avuV KELg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=RWixd5UkkA8J6TPwNZcZKfR3iOa17igLRIWle2VrHb4=; b=VtQhWOxZoABnIkGoyLfT33IRdlnxymUwecrRm1lV+lPCW7EhlOZ2spHWj86tP0BsGl 9PrHydWPpwb3bjW+cCGKZQKK9f87WLy09quG6JA0w0VqXedLzGtlmah3weRuHQOfLnQY Gl45Jyw6Sa5yQKldLYVXnxvC6jZ7kz1dt6LxvGeiNwUnt18koMf2N6R/YW+FjcZQxoE8 BaWHfR1OkDpe6YwoAfmVPsv9bEOwcC7Fua1tdN44zKI7dDiUVRiapmmRHKzmTxHI23ve FXEyU4l6S20KGrJoyVUc9s8ydfp6TcpdHR1eHy5Zoz7R2pq5B6xbm0wjFw3hSyV/+vBo zlPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CcZ7sT2r; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ca6si8542497edb.84.2021.04.19.07.23.24; Mon, 19 Apr 2021 07:23:24 -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 header.s=20161025 header.b=CcZ7sT2r; 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 sp=QUARANTINE 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 6E1C1689E93; Mon, 19 Apr 2021 17:12:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6856B689E41 for ; Mon, 19 Apr 2021 17:12:38 +0300 (EEST) Received: by mail-qk1-f179.google.com with SMTP id v7so7774268qkj.13 for ; Mon, 19 Apr 2021 07:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YezphWr61fyATQU5m5DmKRhPETXCBPP9Tm2uwoAyeuA=; b=CcZ7sT2rW+P224u+83uzIy4k7pqcLBslfupJ1Zpj8OKdanzSz1QLs8KwJ/hok+gZck O2j+y4bYqPJoeiLGItuqV+w/KhXWUUAYm3hv+eYJAZN03OoixOGXRKxA0HOQ3dTMoyeR P43Eknqb0AECfF7+1/QnIVGIU359p0M+Gd6jITZWWnwXKPGwd89BJ94ckB7ycvBSJADS z1aVeOUlMPjKFNVsU3hufij40lEXUY0vfNS0FymE7bcqHrGMaonIf+8YakFfehs6dcoV prIhB0ceykhHFLAUxndxyOVwf08WfDJ2X5rdTjt7ZAuQfFd4GrDMYceLJFWfBr7MZDPj l30w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YezphWr61fyATQU5m5DmKRhPETXCBPP9Tm2uwoAyeuA=; b=cSwjuHxmGKezQ8oX9os9EvolmstaLkjp2EP7Fmj5cj90DcOwIQFPJYf/9X+ntDcK2K CWZq/ehoCZb5DFA9fuy/7N1uMcqBwI4jh79UL0pYMtCBREWco/BfWxwhhxYSlNAE7TZ9 7OQUqvF5xYo9XcIg1BXa5JXYJaCi43kORAxif6KBgKYmN91WQEgHgFzjK6gUYXuSZk0q lk8lC7MZhaagjZAXg3V9xNWibZiVF5IrRXCmdhvdhCc45VZMWq7mJ+DCpJcn8LPwhXjc xdS0u7xwnrtyfXGQaGXguC1GcYgc3GQD1J9VQw3tkgcWsDMJTj/kNZfjUEV75dH9mGRq WlXg== X-Gm-Message-State: AOAM533D1OIoaeYEnE0ivgY+vj8p8PhEwMCpFBu4wGH0gGAzMzuRqS8l e8nX1GYGCq6tW+H9y4E2+CCQXNJN8ms= X-Received: by 2002:a37:a6d2:: with SMTP id p201mr8257766qke.146.1618841557077; Mon, 19 Apr 2021 07:12:37 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:12 -0300 Message-Id: <20210419141024.8174-76-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 75/87] avformat/avformat, utils: Make av_find_best_stream const-correct X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uo/hw0Wv6Jkx From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 4 ++++ libavformat/avformat.h | 2 +- libavformat/utils.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index a823a4419c..d19b817660 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -17,6 +17,10 @@ API changes, most recent first: 2021-04-17 - xxxxxxxxxx - lavu 56.73.100 - frame.h detection_bbox.h Add AV_FRAME_DATA_DETECTION_BBOXES +2021-04-14 - xxxxxxxxxx - lavf yyyyyyyyy - avformat.h + av_find_best_stream now uses a const AVCodec ** parameter + for the returned decoder. + 2021-04-14 - xxxxxxxxxx - lavc yyyyyyyyy - codec.h avcodec_find_encoder_by_name(), avcodec_find_encoder(), avcodec_find_decoder_by_name() and avcodec_find_decoder() diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 23bdaa207b..28069d45dc 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2070,7 +2070,7 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, int wanted_stream_nb, int related_stream, - AVCodec **decoder_ret, + const AVCodec **decoder_ret, int flags); /** diff --git a/libavformat/utils.c b/libavformat/utils.c index 7078891dc0..2f66f539a6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4200,7 +4200,7 @@ AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, int wanted_stream_nb, int related_stream, - AVCodec **decoder_ret, int flags) + const AVCodec **decoder_ret, int flags) { int i, nb_streams = ic->nb_streams; int ret = AVERROR_STREAM_NOT_FOUND; @@ -4260,7 +4260,7 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, } } if (decoder_ret) - *decoder_ret = (AVCodec*)best_decoder; + *decoder_ret = best_decoder; return ret; }