From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 49DF24C46A for ; Sun, 28 Jul 2024 10:27:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9F2E68D726; Sun, 28 Jul 2024 13:25:56 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E255468D89B for ; Sun, 28 Jul 2024 13:25:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1722162340; bh=ZA1LZF46jsamtNo/gXY9X6D9Un+/3BV/RCC29LSeYG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E3tDdNEkcU9hSIXT64JTb2j058qPLWxVhC6NlJWtsZ2fVLU8Va12JnXppqf+VEVz0 TwqRmCZy45RzwRESQsYStoTRgPSeocXtSGxWhBQYAMV/Dx98qPy22SA7a/ASAQex1D OdSjbY6CbSFYOS3CXGKACYcENlJcauULFnu1iLdA= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 09F79470B2; Sun, 28 Jul 2024 12:25:40 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 12:25:27 +0200 Message-ID: <20240728102527.17991-22-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240728102527.17991-1-ffmpeg@haasn.xyz> References: <20240728102527.17991-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/22] avcodec/libx265: raise strictness of missing DV error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas See previous commit for justification --- libavcodec/libx265.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 718bd21b20..325c4fdd07 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -792,9 +792,11 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } } else if (ctx->dovi.cfg.dv_profile) { av_log(avctx, AV_LOG_ERROR, "Dolby Vision enabled, but received frame " - "without AV_FRAME_DATA_DOVI_METADATA"); - free_picture(ctx, &x265pic); - return AVERROR_INVALIDDATA; + "without AV_FRAME_DATA_DOVI_METADATA\n"); + if (avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT) { + free_picture(ctx, &x265pic); + return AVERROR_INVALIDDATA; + } } #endif } -- 2.45.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".