From patchwork Thu Oct 26 15:03:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5696 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp917382jah; Thu, 26 Oct 2017 08:04:09 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QBJ+LbWqGuzTzfbiWq+4xYBmle9/HnzB8O1l1/rdnkA4A66MQk3jCAG7C5+yVWi1kbyjsL X-Received: by 10.28.88.21 with SMTP id m21mr1759542wmb.111.1509030249340; Thu, 26 Oct 2017 08:04:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509030249; cv=none; d=google.com; s=arc-20160816; b=SGTMVmlHl8dj4MBvdASRuDeUJA2vG8YtPuGeAhdHU+Ftua9pQ4q6BlIwqP+c/ynBYj /+HdEu4rSTmlveZGZjvHz3xBpho50hPEccvxVI4OlNhIZqrtgU08LcRB7APPNuyefCDI bUIUFlfI9uf4XLHIq0ww74EYga22ysDyidulR5W+GezPCP73CK/E8+6iUddUKTablRn6 t9U0Igb4RJJDmNgwPdIRZmntHPkbE42nF5wdp3m1pU8F0oY1EmIfKOoajKSruUajzi7a mpjQz9vjRzaXQ8/Rqw1covo5SA1hxu6j2b2jJCy5rjSQUFW/9B7KsevmmAWSTDfPoPMV xtng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=pKZCeHnK698cOiDAzhj93o4swXVsZkO1mEnBbXusKIo=; b=KjOwzFl5qmvgq38/XUKhspym04JceDDufr4Xn3ZzI3akBFiSEkx+xcO4aqe1Z+p4N2 yyXdX/QPD6Ihc365A5L/aFrlqKrzluGQcQl6EWcZpSfEFiG1G2l3xVBCc1UQjpFNkEL1 jNGDMY9MeFIXNjRE5006VPH5E7HVPY7oP5yUggBrwOCsWlFHaJMf26jMByy06XNAEXBp 4cJTwGz2gCTFg/VBi32EClLd4Kfw6qKexsZyPr8hKgYKNf2uw3ozpt1PY/AwB1izJh4/ RgUvgKRmSIF/TahoJYQ8dEvxf6hputtrUUqTOXLR6vkL0+YXL4ebUcN758bQfzubZ+2E ZiuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=l5uaLxAL; 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=NONE 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 e28si4344298wra.96.2017.10.26.08.04.08; Thu, 26 Oct 2017 08:04:09 -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=l5uaLxAL; 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=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 63F4868A5CE; Thu, 26 Oct 2017 18:03:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f172.google.com (mail-io0-f172.google.com [209.85.223.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BCEA68A5A2 for ; Thu, 26 Oct 2017 18:03:52 +0300 (EEST) Received: by mail-io0-f172.google.com with SMTP id 101so6047166ioj.3 for ; Thu, 26 Oct 2017 08:04:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Q26iBAswV/baBFLg5N3s0vAYFZP1BE0OZpExdQU9MOs=; b=l5uaLxALgPJrZloZ5kIZyxlAJifp5F6MCg6LBM0ejBWocF3TLoCujGQa15LrOyy8Oc V04DPgn7TeKCj8jNRKu3K5yuzeBM6py6+8zAfMpfnW9WPzrKuVUGrdY4pKU0tBNaEfkv vsBq+ogjEv9Ds0eeCWKqgSskPCWcf6gGGOeu2k8U3Db89kvczy4Sib0CC57Eom9pZD76 gtmhl+C9348oYsAvqW3IJma2vtH0PCtJ6yj/WJfgYoy66oxrxSD0UezgI0nxS+Ohrz5D C5i3N2ZYRLGHM7Mz1hf5NB9FISTgx9/SzAK04AGtcL7/q8WB3t5pXdRjy090azyETsPZ yrQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Q26iBAswV/baBFLg5N3s0vAYFZP1BE0OZpExdQU9MOs=; b=Tt2v3x8MDaOajy8bBuAd93XVGR5hT80w1nT8AAvprVBoqOz9Fn9CxEr1Xwmp93pBKp 4o+IyW/MRtsluyxvU3ixQ+JFL8nqKas5CP2MedIEKhjXvEDeDME1c4+skVuJ0n6/b0xk d8sv0qGQ4AMebOZodi9GPSSEEpgzaDNMx6ELrbrj3T1MCzO8B5F2dJATLnaNxiRmhd4h x0u0yKGw3nx1yy/iE4yxG2fAe5lBVIuimAPxrfZRBvPuqWr3exEjgEURotTMADdlY2MJ 9Y6Via09h3NdW07U3DIu+frFy8o8AdnkFHAhNBF7FXqlENwuzwXS+5BpeOuyL5atMJny KJxg== X-Gm-Message-State: AMCzsaWOxvgEsEAlp6zpSDV3m0p2CNFAnwNqxvanIXllGY4Fhg+Uigvf itMkP2XAu4fVyIc+e9uYIFvuVNmx/iGY+I/aLZM= X-Received: by 10.36.8.136 with SMTP id 130mr2948836itc.18.1509030238432; Thu, 26 Oct 2017 08:03:58 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.63.101 with HTTP; Thu, 26 Oct 2017 08:03:37 -0700 (PDT) From: Carl Eugen Hoyos Date: Thu, 26 Oct 2017 17:03:37 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lswr/swresample: Mention actually supported formats when erroring out 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch is supposed to fix ticket #6779. Please comment, Carl Eugen From 17ffc43ba32c83e0e1d26df06b7f4445adb1206b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 26 Oct 2017 16:52:22 +0200 Subject: [PATCH] lswr/swresample: Mention the actually supported formats when erroring out. Fixes ticket #6779. --- libswresample/swresample.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 74c96dc..f076b6c 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -240,7 +240,7 @@ av_cold int swr_init(struct SwrContext *s){ &&s->int_sample_fmt != AV_SAMPLE_FMT_S64P &&s->int_sample_fmt != AV_SAMPLE_FMT_FLTP &&s->int_sample_fmt != AV_SAMPLE_FMT_DBLP){ - av_log(s, AV_LOG_ERROR, "Requested sample format %s is not supported internally, S16/S32/S64/FLT/DBL is supported\n", av_get_sample_fmt_name(s->int_sample_fmt)); + av_log(s, AV_LOG_ERROR, "Requested sample format %s is not supported internally, s16p/s32p/s64p/fltp/dblp are supported\n", av_get_sample_fmt_name(s->int_sample_fmt)); return AVERROR(EINVAL); } @@ -276,7 +276,7 @@ av_cold int swr_init(struct SwrContext *s){ && s->int_sample_fmt != AV_SAMPLE_FMT_FLTP && s->int_sample_fmt != AV_SAMPLE_FMT_DBLP && s->resample){ - av_log(s, AV_LOG_ERROR, "Resampling only supported with internal s16/s32/flt/dbl\n"); + av_log(s, AV_LOG_ERROR, "Resampling only supported with internal s16p/s32p/fltp/dblp\n"); ret = AVERROR(EINVAL); goto fail; } -- 1.7.10.4