From patchwork Fri Jun 14 19:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Cawley X-Patchwork-Id: 13539 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 831CF448CAB for ; Fri, 14 Jun 2019 23:01:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CF1768A73C; Fri, 14 Jun 2019 23:01:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 814CB68A71C for ; Fri, 14 Jun 2019 23:01:25 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id n4so3709360wrw.13 for ; Fri, 14 Jun 2019 13:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ePLtBgWxek2zj846ZTk04h8Xzf7KrX3C1WrpiAtQLb4=; b=dX7ej2YNwermCWaBnsi47NukibUBKCb0fdRVGwj/mKPjOIDsx8Vpu3YkU3fMv+0akJ EEj+/3664EFq2Iy5clSBIONC7yJZebYTdi8Uo5jgDAX8sj29smgwYbeGxe4cPOVaEjmN YCBEq3C03RWWf2yj7lzC6qJniQdJzj1cVrojme+xT8jvI0BXdDT24BQwz2ED5+Qe6kuF yajxep3vq/0vyqAjJqn7S2c7hEnyGliSyui1Kro6Djafiw6Ohc+gcfhNDAwOg6DkiHne TAbNHEKUVixVtXRN2pJ1Pa0yeY/G8n0TPGRd4xN3kmpwZVJMmLgvoAEXZAiFTnPXBICK U07w== 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; bh=ePLtBgWxek2zj846ZTk04h8Xzf7KrX3C1WrpiAtQLb4=; b=U8RBNy3LjvfDYmFFdU5eq7mSKpFThLUIWEPSdSFQhinKjF1H9kRC58ckFmpnQCDwD2 8VnEWVMD7KOj0JXWQw0qmNVQ3kuJ7wh2rfTcdBBvRF4kYUgseT3vRofObtguOw0+CzmG 8U5L4ADWqT3aH5SQFbsvXtC4c6PhIrY29pJrFvBGsPYcKcJtyI8BlSOY/aiVaXIDzlN2 QGPcLaV42p7we9IMBaxReS9pFZ4M7g77Y2j3lYaympjw6zl2CYOjuShxYCXbZqVxtn2K HAwi9+ZRNeLrmjchCcVdFnPxeuHD2EAUAZfoJt2zxtaojfU7vv9pA61uIIeswu5yzYV8 QpNQ== X-Gm-Message-State: APjAAAVkLr7c+gsO22jxzo3UxWpwEQsg/qg7Qtd2LM6wI0bQX+T0XH5v MpvgQlkIBm2BMFR6+htHM/uQp28n X-Google-Smtp-Source: APXvYqyPsEKkBg9s8cgTsozcY3M3pQQMMng181Lzlcl9axV2ftWhg9l8JDt4GCw5oqCxnV7JJI1yeg== X-Received: by 2002:adf:fb81:: with SMTP id a1mr24978883wrr.329.1560542049213; Fri, 14 Jun 2019 12:54:09 -0700 (PDT) Received: from localhost.localdomain (host109-155-177-56.range109-155.btcentralplus.com. [109.155.177.56]) by smtp.gmail.com with ESMTPSA id y16sm2668221wru.28.2019.06.14.12.54.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jun 2019 12:54:08 -0700 (PDT) From: Cameron Cawley To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jun 2019 20:51:33 +0100 Message-Id: <20190614195134.19205-1-ccawley2011@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/rpl: Fix detection of 8-bit linear formats 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: Cameron Cawley MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Was previously broken by commit 8cf5f94. Fixes ticket #7859 Signed-off-by: Cameron Cawley --- libavformat/rpl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 7aec3503da..683b3a835a 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -210,10 +210,10 @@ static int rpl_read_header(AVFormatContext *s) ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; break; } else if (ast->codecpar->bits_per_coded_sample == 8) { - if(av_strcasecmp(audio_type, "unsigned") >= 0) { + if(av_stristr(audio_type, "unsigned") != NULL) { ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8; break; - } else if(av_strcasecmp(audio_type, "linear") >= 0) { + } else if(av_stristr(audio_type, "linear") != NULL) { ast->codecpar->codec_id = AV_CODEC_ID_PCM_S8; break; } else {