From patchwork Sun Jan 19 21:49:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Gonzalo_Garramu=C3=B1o?= X-Patchwork-Id: 17429 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 CB678449E61 for ; Sun, 19 Jan 2020 23:56:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACA0468B2CA; Sun, 19 Jan 2020 23:56:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3121068B255 for ; Sun, 19 Jan 2020 23:56:06 +0200 (EET) Received: by mail-qt1-f194.google.com with SMTP id w30so26192229qtd.12 for ; Sun, 19 Jan 2020 13:56:06 -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:mime-version :content-transfer-encoding; bh=690C8uLsFnYfAzAQRl5b7lFhzOfhoxkjP/R2KHV0HBo=; b=dvBwEE7KHvEnw637OF59iXH1k6x/DlZe4tMvaF2wlCUok4aeSn+QffnCjEw0OuOLsO xdVPDySHp498CSjL32DzjWNk25WjV6sqBEkuJ6Xfu6RZPUdCFVJLyEPhlfGbVq1MYWZG 54oxz9rW0Ht2th3o1+yRykmDOPsnpeuDxKFAkrvadkxn8EFDXjzvZJ4WbM7MrJ0uHT/m pKG9J/ZcDYILvGZ01EIdeVN7WZrYZ6thhUXeTXhJAow3DkON6VArngwZ4e/QdVVf0hwU 3UKTq0u78ApfsC3ml7Bn95YPkGkpawbzeX6MshdVHgfYL5agGPk4vctFFNksjvzAH8yW nesw== 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:mime-version :content-transfer-encoding; bh=690C8uLsFnYfAzAQRl5b7lFhzOfhoxkjP/R2KHV0HBo=; b=G2KLtfya4qkuC8SucNkXU8JGSPfN7Uy7a7g1ZDSXqOOV5ZE5V60Yldkray0NA5j1KL ftFr+Ys6vN5CxJ8D3YWHVABOHS1JuxY1HIRmHV1Y5TfDzZLSbVC8T2V+FFUaWS8L2dAO Py+P3fPqH2H/zzOt2oqzm23XUhRj2koVuO8UEEPGdGV8+tpRcblPbh83KWoQxesnIOVa ypQYS5yPHdQbKgF7e4a4LivLOuOnXENtG+O4dMDQhlVf8IfOuiX8Fm2VxFVgPa6w4nKn PpyocDKXqZdmo20tbUqzHi8BBMSN/H9DcwBd0ExAGujq/YV9joM1IzJ4hAbgCiSy9h2v GV2A== X-Gm-Message-State: APjAAAU+jUoLoOeloRw8o7exyz9eZmSrUqq8NE2BhjywhrT/1ilpSTYZ 7SQVXPjmTE3gG4zdyh+n9aH14x3KMTY= X-Google-Smtp-Source: APXvYqyDwCWZjzkrGayGj7tVE0S9iTLYE7Fkqrq5yXO+T/S+xBbtCyx3kD9elKR3g6fLBJm+uZQkCQ== X-Received: by 2002:ac8:7b9a:: with SMTP id p26mr17738728qtu.281.1579470609051; Sun, 19 Jan 2020 13:50:09 -0800 (PST) Received: from localhost.localdomain ([181.167.196.166]) by smtp.gmail.com with ESMTPSA id m21sm14941269qka.117.2020.01.19.13.50.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Jan 2020 13:50:08 -0800 (PST) From: ggarra13@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jan 2020 18:49:04 -0300 Message-Id: <1579470544-23468-1-git-send-email-ggarra13@gmail.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/exr.c: Made channel name comparisons case insensitive. 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: =?utf-8?q?Gonzalo_Garramu=C3=B1o?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gonzalo Garramuño --- libavcodec/exr.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index aeeaed4..49250dd 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -41,6 +41,7 @@ #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/intfloat.h" +#include "libavutil/avstring.h" #include "libavutil/opt.h" #include "libavutil/color_utils.h" @@ -1399,24 +1400,24 @@ static int decode_header(EXRContext *s, AVFrame *frame) } if (layer_match) { /* only search channel if the layer match is valid */ - if (!strcmp(ch_gb.buffer, "R") || - !strcmp(ch_gb.buffer, "X") || - !strcmp(ch_gb.buffer, "U")) { + if (!av_strcasecmp(ch_gb.buffer, "R") || + !av_strcasecmp(ch_gb.buffer, "X") || + !av_strcasecmp(ch_gb.buffer, "U")) { channel_index = 0; s->is_luma = 0; - } else if (!strcmp(ch_gb.buffer, "G") || - !strcmp(ch_gb.buffer, "V")) { + } else if (!av_strcasecmp(ch_gb.buffer, "G") || + !av_strcasecmp(ch_gb.buffer, "V")) { channel_index = 1; s->is_luma = 0; - } else if (!strcmp(ch_gb.buffer, "Y")) { + } else if (!av_strcasecmp(ch_gb.buffer, "Y")) { channel_index = 1; s->is_luma = 1; - } else if (!strcmp(ch_gb.buffer, "B") || - !strcmp(ch_gb.buffer, "Z") || - !strcmp(ch_gb.buffer, "W")){ + } else if (!av_strcasecmp(ch_gb.buffer, "B") || + !av_strcasecmp(ch_gb.buffer, "Z") || + !av_strcasecmp(ch_gb.buffer, "W")){ channel_index = 2; s->is_luma = 0; - } else if (!strcmp(ch_gb.buffer, "A")) { + } else if (!av_strcasecmp(ch_gb.buffer, "A")) { channel_index = 3; } else { av_log(s->avctx, AV_LOG_WARNING,