From patchwork Tue Jan 30 09:27:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 7447 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp110065jak; Tue, 30 Jan 2018 01:28:15 -0800 (PST) X-Google-Smtp-Source: AH8x224EkFckHzx9HZGLYYOReUPRpsJzIkdRQBV+3iuFnZMRT+gcP4Biuvu2nrWBq9uOEtAys0cM X-Received: by 10.223.139.156 with SMTP id o28mr21386003wra.165.1517304495230; Tue, 30 Jan 2018 01:28:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517304495; cv=none; d=google.com; s=arc-20160816; b=pSly1GgnRIABeBPaCFoGA26S8Uu7+HhRBmifv9cx8jlC1v98nXYS0PUi6xZkAOnec2 qaeKIvkesJxvKfeOvUWe9HdSE17bhxvicYAQk+fDuBVAfcFrwmGrPSFt8U8xTTBc8dFm lP2q5SpPbcY0dQdP5XNKEnc2GISrCI4WWy2izjBRgJq9pZTJibehKqIKTta8OAyUICk2 ImoCN6zUKk5Xi6TcHKnzAzMSHQZCyC9S6Kl7APuOd7lTbpgRqs/V1tIAmroVmoi4qyDQ k+bhmUd3j1kU9AYbc7BUUanvmE439zzQmBz6z+Ix4e1r/MoAVKAnklbVXSUY6nx2OPF8 1HYQ== 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=eb4JhnqlcHxBgF/xkLe4JBwgNAue9J/GKAeaDnfvlMM=; b=IIwzfeK5Xs4hC6EoKMq7qiZALQY/iK3QCiDo5d43LH2euRwj20dURvT1zRgVajh4jQ ZvEI69X4k5xTJMzPgrz5nb6V/mbd3BKyciA5eyoXxFMJnEqUnJ2Jr4k4oB/85QzdhCF4 i4zXlfrOKG1dpaSYA8dn0lPT/mF29RTb57qscZKR2tqxYlQPEYg05TsFLM8oERE20ihU TceBrWLA97Aao6HvgJiLu3sDpJ2/h7YvRbcECdpEGOo54xBt7Hc3JbixHT9obfdrx2CE 2T8TsmAPPZjT7qWw77iRj7WNE1LIWZk0jwRyx4OcTxJEh8+O9B9CWxyCaidg4CV9hzlw u7TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=M3JDs7JR; 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 141si9094334wmt.271.2018.01.30.01.28.14; Tue, 30 Jan 2018 01:28:15 -0800 (PST) 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=M3JDs7JR; 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 DD1636891F3; Tue, 30 Jan 2018 11:28:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f42.google.com (mail-it0-f42.google.com [209.85.214.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EAA5680753 for ; Tue, 30 Jan 2018 11:28:01 +0200 (EET) Received: by mail-it0-f42.google.com with SMTP id m11so1976428iti.1 for ; Tue, 30 Jan 2018 01:28:06 -0800 (PST) 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=iDzCf6V1qKpaZeQai+91wLDeTQOUVgGgoFnjSSmv07A=; b=M3JDs7JRqZXxYatukCrhXds8DcnmdL1RCbvuiHx4g8qMhQjdh9VIK6z43LAFjEyV6T 1TSAb84wzPmSZ6kEAP4k0x6L9c/sbOtasI9nSBBtjnmjlnsZS0dimulgIal6gQkdfLi+ +YgYkyshvurcLGHslmAxmNrbAsXhNkln2It3MkI9P4g/k9tPk2W//ejUpC+uX0kMjkpT a29ZsbAripe4+NS2btBZ0B/ENd5ZAr21ZHT+0NsF0J9pUQQo5y0DzydZ6y3TwYfFjKsu aq0tmrOSn6S/RFxwxWAV2WMNtFQLajZh8K3VGMCKouIiAx64Dh8ZdesHxHxx+tiJssR+ FeVw== 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=iDzCf6V1qKpaZeQai+91wLDeTQOUVgGgoFnjSSmv07A=; b=JZnnwJ0fQLByR/je0TJteVoy8Pw+2UicgtKr05wfQLWz/zCyW2RVaLfbH2vFHxQvuy +M6KUrceG0zRQqR1QR56/Y5UUqD3k4nEx+2hgzL30pFBWU/Rwo2zahWaHalQtUh4NU7E WQFGCWDmN1O0cioXso2BWg0HtaudtpV+3GIuqgqsPIOGejFWyDEF2Jf/vzibILH9VuoL 6p39cvPDpkEe5dO+zlJbFrKkDAKElAzp4JDZTn/t96qzQ78+YaIGkOO0jtDHZIWmQ/lq A29LILZ1ADy4p6unZkQlorn4szK/NzYlFAw9qfG5fIxuLiskYvIWY66eh+5yOnP9tC/x SRsg== X-Gm-Message-State: AKwxytetTvq+U375RAkgM0oZD/5VK7xjwPkf7hJpTvHNl3iSaWzDud0Z ei/m/w0zYkol95izJTML5N0JFELFpDZKnHEVtmY= X-Received: by 10.36.254.4 with SMTP id w4mr12782192ith.80.1517304484871; Tue, 30 Jan 2018 01:28:04 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.138.170 with HTTP; Tue, 30 Jan 2018 01:27:44 -0800 (PST) From: Carl Eugen Hoyos Date: Tue, 30 Jan 2018 10:27:44 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/exr: Ignore long names flag 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 fixes ticket #6994, unknown tag names are ignored by FFmpeg. Please comment, Carl Eugen From 19f1896fc182f2bc8d1c715883ab40aaf17fc828 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 30 Jan 2018 10:24:08 +0100 Subject: [PATCH] lavc/exr: Ignore long names flag. The decoder only reads known names, others are skipped. Fixes ticket #6994. --- libavcodec/exr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 454dc74..802618a 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1349,11 +1349,8 @@ static int decode_header(EXRContext *s, AVFrame *frame) flags = bytestream2_get_le24(&s->gb); - if (flags == 0x00) - s->is_tile = 0; - else if (flags & 0x02) - s->is_tile = 1; - else{ + s->is_tile = !!(flags & 0x02); + if (flags & ~0x06) { avpriv_report_missing_feature(s->avctx, "flags %d", flags); return AVERROR_PATCHWELCOME; } -- 1.7.10.4