From patchwork Fri Jan 29 05:22:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25256 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 0B87D44B31D for ; Fri, 29 Jan 2021 07:49:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAA67689A01; Fri, 29 Jan 2021 07:49:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC5746899DD for ; Fri, 29 Jan 2021 07:49:40 +0200 (EET) Received: by mail-lf1-f50.google.com with SMTP id e2so7232865lfj.13 for ; Thu, 28 Jan 2021 21:49:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=82aZqZ3q41Pkr/h6M+i8wDKlPhC56H8S+YT8xp8tt10=; b=El4i751nE8g5Qzxqd7UATGUx/pcOGQySBZ0bYUmkLdnisUOd+iO9RuEtzVXIaNL1tg ZZuQ5EZ1i2mIZ6i+hpDyqy9A9duZT5LJXP/pybN+eWQJHbP3TM/8wWNVKW+GpRzRUTQ+ LMxjVvHFDj4yBZodPYqGyLLOBVOP05LZJFQrP/EFSOdGevnGpgY+rmP9CePPc8ias+bD 7qQhGT7Au08e4+2P4lesImn7NRiZ1nbqmugL926yc+/9W9r28uxg5rH599HpxQ2llpLR 3yqsAWH0WR74HQI1w6tnC7XFs2ylb0+BYuW7a+Nb0KV86RdLv1MOSS9KhlFhfwGVQ6Oo EMww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=82aZqZ3q41Pkr/h6M+i8wDKlPhC56H8S+YT8xp8tt10=; b=Sy7BQrNXsHUy/m53rgJV0ck3sIwUuERJaiu2Fq6KutT+Vz7jKcPX1w0neDqnlAzo0L Qt5OFWKeZ9onuSQi8zlVINy6FwwzjKB/EAy9K5EXFrVTKxvXhS3+Dm3e9lTJ0WBdh5Dr lr7YahSB1b5154xQZK1OgryGaAeLPPpDdq+iWYdugBN5qiAm6k27ak9jg6JVN8BCepL0 4KAPQZ1wEZeDgLQjGJ7xFEHNEB4pntKRvvUVkUw3bCeANKtu1721utr/ubAvnu3r9kA0 Q8eUMcPykC826KriOanTIOvyfgx3FV52re9JhFOY6OQvRwAJiPM2warcmXDOFCnDA5P3 F1Ag== X-Gm-Message-State: AOAM530IzsszdAo0CQtFW2P1A77TZOCEg80lY15rDE7YU6x21gmXJ9x5 f4ltQKdmuqL41Vvh+EZ5NL8VyBcThYU= X-Google-Smtp-Source: ABdhPJxcfs/c7cxIBh3xnvIBn+a8j8bmVwxoG6RxzY6+Wbi1Vrna7dzIGZQfJQKOyw1XRYylSCEROA== X-Received: by 2002:a5d:4d08:: with SMTP id z8mr2533427wrt.240.1611897981599; Thu, 28 Jan 2021 21:26:21 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d13sm10068611wrx.93.2021.01.28.21.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 21:26:21 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jan 2021 06:22:57 +0100 Message-Id: <20210129052302.3124447-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> References: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/13] fftools/ffmpeg_filter: Remove choose_sample_fmt 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Unused since 6b35a83214f1bc3fb38c9ea9c2cd3676f28709fa. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_filter.c | 23 ----------------------- 2 files changed, 24 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 8046e75026..6750432a81 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -652,7 +652,6 @@ int guess_input_channel_layout(InputStream *ist); enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *avctx, const AVCodec *codec, enum AVPixelFormat target); -void choose_sample_fmt(AVStream *st, const AVCodec *codec); int configure_filtergraph(FilterGraph *fg); int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index e9e31e043e..38e44d560b 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -91,29 +91,6 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, return target; } -void choose_sample_fmt(AVStream *st, const AVCodec *codec) -{ - if (codec && codec->sample_fmts) { - const enum AVSampleFormat *p = codec->sample_fmts; - for (; *p != -1; p++) { - if (*p == st->codecpar->format) - break; - } - if (*p == -1) { - const AVCodecDescriptor *desc = avcodec_descriptor_get(codec->id); - if(desc && (desc->props & AV_CODEC_PROP_LOSSLESS) && av_get_sample_fmt_name(st->codecpar->format) > av_get_sample_fmt_name(codec->sample_fmts[0])) - av_log(NULL, AV_LOG_ERROR, "Conversion will not be lossless.\n"); - if(av_get_sample_fmt_name(st->codecpar->format)) - av_log(NULL, AV_LOG_WARNING, - "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n", - av_get_sample_fmt_name(st->codecpar->format), - codec->name, - av_get_sample_fmt_name(codec->sample_fmts[0])); - st->codecpar->format = codec->sample_fmts[0]; - } - } -} - static char *choose_pix_fmts(OutputFilter *ofilter) { OutputStream *ost = ofilter->ost;