From patchwork Thu Dec 13 19:15:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11404 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 B059344DB05 for ; Thu, 13 Dec 2018 21:15:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9AE668A8B8; Thu, 13 Dec 2018 21:15:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76D9A68A852 for ; Thu, 13 Dec 2018 21:15:12 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id y1so3461728wmi.3 for ; Thu, 13 Dec 2018 11:15:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=wUmi2Trucw2C2KTYpf5iEQrsPEtvYlRiUkNRnIZj6sY=; b=keGnkpbJ87rtunKr89k6z1dcLNS/gTCOgjRR/LVdq9ubIEUOGvswdQj9x3mM0c8S/k wX6bWhNu9QKv2sXdMLq0H4yBQxLl/XJbuHXtKdNFLHUxgTUAjxYcYcwEW1/i/kCXL5XR 9y9HjW25q1eJag4mNtgjyWHdlIcQOIpyxJKCjbkuA8fHD6Rsm1l4NMP7HVNXNMRQzvmA ZE9b2LRwNJkueXF3u+c8/l+zEC+9KdhPhO1IS53u9d9l89hXpHNiym6vaAl6R+/aOvtA VT/3cXn0H6UvD3HG7cC5gvQKU2mMr6TknaZkzkv9+0luQcT3k6GCJq0YRZKS1bIkJdnJ MO7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=wUmi2Trucw2C2KTYpf5iEQrsPEtvYlRiUkNRnIZj6sY=; b=WSBLQCxteBxFAUX1OZ4U6byttdnd2nej98xSS0O8Nj9+c+cWNUoV2nJVxK9YVfTt+o qks6ylQK/MyXuMp/47ZHBV3qh7i7Y48gllSYsAkIH1mKh+/hBQx45+HzA6OZoTbhIRQk qd7f3Jc1XEf9EGmQp/aJPWe6fMqcH1OAJdp3Go3zxz2o6UaGocsQ0oQj/cLDbYuKpyXh 8wlHYvdkkPcmKo2Ef371kerOGK8hPWy3gZgWI5bj1Ywuxux0tuKzZ+DaS8LvUzEB4NpV QWKuCL9AUQM1g1ZstHFUwcJD6LbkKq/dt/F22foXWlx2tSEsOI4HqGQuvfP+RFkci4f+ 3j+Q== X-Gm-Message-State: AA+aEWZsNMHseWPaehajf+3W/ea2uZAoWEQEfv7d6XeMVOQs7ZJUOnPX AQA9Kfrb6EZfOKXHkT/MSUT6O0L4 X-Google-Smtp-Source: AFSGD/U7HogaSdX318H4yb21U6fLD/7uvRoNOcMNOH7SawyAgJKNUYjPCNYBdxruJ9OJjoZgDH8v9g== X-Received: by 2002:a1c:1a90:: with SMTP id a138mr590605wma.109.1544728511380; Thu, 13 Dec 2018 11:15:11 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 60sm3534371wrb.81.2018.12.13.11.15.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 11:15:10 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Dec 2018 20:15:02 +0100 Message-Id: <20181213191502.3199-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/flac_picture: try to guess PNG by actual picture data 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #5028. Signed-off-by: Paul B Mahol --- libavformat/flac_picture.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c index 38982b960d..6698d4ea6a 100644 --- a/libavformat/flac_picture.c +++ b/libavformat/flac_picture.c @@ -20,6 +20,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "flac_picture.h" #include "id3v2.h" @@ -119,6 +120,9 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) goto fail; } + if (AV_RB64(data->data) == 0x89504e470d0a1a0a) + id = AV_CODEC_ID_PNG; + st = avformat_new_stream(s, NULL); if (!st) { RETURN_ERROR(AVERROR(ENOMEM));