From patchwork Fri Mar 6 20:18:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 18074 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 A8D2144B63E for ; Fri, 6 Mar 2020 22:26:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83A6168B0F2; Fri, 6 Mar 2020 22:26:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66B2B68B0A1 for ; Fri, 6 Mar 2020 22:26:46 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id e26so3694639wme.5 for ; Fri, 06 Mar 2020 12:26:46 -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=4Z5VWcxVPk+inLECQ7VYSB/LEH9guMI16E05QXZKdsc=; b=YLu4hnhrMGlDOY9XzgJ9RqenRH6ZbTXPXIfWYvMFIyzJ7sipmPs8hVJDTN7PE8MIyO 03monUF1yU42xuGi5Fy5tU5HZlF5A/R2vOJTSFhyshPmnZh5nNBjXQdqidE15hsP0vPZ hYWyXKwuYYvwXvUJQM3zWSeYo2zvskZ4BGVKxNQ0Kt3BMcoDmSU3H/l9FHnQafaTVcu2 l7sE2eHMIBBnL2d+w2z492T/L178MvvhACmLWY6PkPZQDjPWjDNfa5OEdR+2XVVMA0OO 5yYBt/5rnnwrqZgFcqZ/bP7YGssf3K/CEGpkGWJssnZa6ois8NfBqJY1vYOmcfvOrZtx eh8Q== 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=4Z5VWcxVPk+inLECQ7VYSB/LEH9guMI16E05QXZKdsc=; b=BlFyzP86zh30hbAcEsqM93Ma56ik2AQkO7JA9EICR2fuer2vgdwfcMomFPT6rPnIYp TmlL/iqQbXAT9fYH4xdxe+TbNAGr+9s3/3zGs1Cr1FweinwX6nQGkrtXUm/EOpUtGLp0 hxTCyRbS3pJOcs2Sn6+6buKIJmOCTP75sYUamk6sMRlOy8Ahg473nbclbk+WA1n+SX7n 1E9UNUiDTdvwGuymsm+EZGXCBeaRqFbzsNAE29SRckL035CEBTBRxbk7LY0vXcr7lNVJ mdyp7tYXsjm517G7jCxVE6NJSArrAVr37n4n79rFA8/6VDOBuEuUHg3Yeq3Ial1RCqmp 8u3Q== X-Gm-Message-State: ANhLgQ2cwE1WKqYr4TmjReFUjfv+zIIkgBKKFymOqoPr393he6ryH6/q VLEQ0DfCG1pL+YyFM0U3wQX2O2QB X-Google-Smtp-Source: ADFU+vuNobesDKf6F3gfOW/GDh0JxtcoYyE5f9bhygKuy+0biydv2Wtbivq8TVfHDdII4mgwWvxRiA== X-Received: by 2002:a05:600c:215:: with SMTP id 21mr5556910wmi.119.1583525945890; Fri, 06 Mar 2020 12:19:05 -0800 (PST) Received: from localhost.localdomain ([109.227.41.139]) by smtp.gmail.com with ESMTPSA id m25sm14395296wml.35.2020.03.06.12.19.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 12:19:05 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Mar 2020 21:18:50 +0100 Message-Id: <20200306201850.31668-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/avidec: recognize H265 fourcc as hevc 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 decoding of came2_2020-01-13__20-38-58_21-00-00__Chn2.avi Signed-off-by: Paul B Mahol --- libavformat/avidec.c | 2 ++ libavformat/riff.c | 1 + 2 files changed, 3 insertions(+) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 412e4a8479..7fdc0fbf8b 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -832,6 +832,8 @@ FF_ENABLE_DEPRECATION_WARNINGS st->need_parsing = AVSTREAM_PARSE_FULL; if (st->codecpar->codec_id == AV_CODEC_ID_RV40) st->need_parsing = AVSTREAM_PARSE_NONE; + if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) + st->need_parsing = AVSTREAM_PARSE_FULL; if (st->codecpar->codec_tag == 0 && st->codecpar->height > 0 && st->codecpar->extradata_size < 1U << 30) { diff --git a/libavformat/riff.c b/libavformat/riff.c index 3679b181df..d3719c29c2 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -497,6 +497,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { const AVCodecTag ff_codec_bmp_tags_unofficial[] = { { AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') }, + { AV_CODEC_ID_HEVC, MKTAG('H', '2', '6', '5') }, { AV_CODEC_ID_NONE, 0 } };