From patchwork Wed Nov 27 07:48:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16440 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 CEF1844ACB4 for ; Wed, 27 Nov 2019 09:49:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8EED68B0B1; Wed, 27 Nov 2019 09:49:31 +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 123AC68AF81 for ; Wed, 27 Nov 2019 09:49:26 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id f129so6239743wmf.2 for ; Tue, 26 Nov 2019 23:49:26 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=gFdyK5FTMxOadOszWJGIPadXEdBiWo3yGQm1x+L1RIA=; b=ry8Br7PBG5ndoTDZvQKZcjijVOKxB+BSIdoktt2ZSMMsAtFPjHPK2IDywM6PVBdhkC CW+3OMWYZ49GF7slglE1Xm5q0Hep1IWbHcecKlPY+LRrscQtaX125x1FEGEjHt9WJsOi 8mREAIPnNTjOOU+P/kS2ckkD5BABox4jYmjJnICrwq23qxaBogQaDbOju9MOFzZpH4Z4 0jDa8XNZw52vb2DjCqzvw8SvqKW+N/hDYEztvnjob+/Eedl3LobIu4DKC24j3sevia7J HoE/y7lgzz7KrmyQzmO5tNLkdyv90j6bkaxGzDJ2s6hl3JohOuCa6I30G9+ApsaNoYDC WoQw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gFdyK5FTMxOadOszWJGIPadXEdBiWo3yGQm1x+L1RIA=; b=r4vfjtS4ly5mCTTcaHJbhj/OXEOzW4tQOct3tR4DawezeeOOZREh4B2nWG3t3T4BgS 7mHgJSFa7PTVbyJjiOa2YjcYK2LfW9pER9mCRhw0EQ8G2UvvX4DUCc9/xJeYbR0odnBG jiRIVIRkdVxZTY7E5dSweEv7yrqYeox5F4p+/oJKyWumwAwLCOTNPu3j62ul6muj/JCR F2Enlq+1q0tRmRI0zYmZFBBGYB+06N58AtfhPEXmyKkaqisPtzNrNUa0Kiae+kWSFo/K QuTPSaiDYd8S70veVX1Y5GG8+2gNYUjUWJ06xhlA4TN7vzE4u78qnakYMG22gafFLrpm rmEA== X-Gm-Message-State: APjAAAUftWSDV82EQlG3nQ2lUV20o1twUSxIhVGLExfjbrg+4/OtXn2r 7ojLFWwshFsMYhxWmpa8Z7hLVQN3 X-Google-Smtp-Source: APXvYqxUEW7p22EIh2dar4CAy0pjmuVKpiqLBgBVywhxfdVGvUS0R2+pkmCwSTI9+fZVeteBo9srDw== X-Received: by 2002:a05:600c:1009:: with SMTP id c9mr957750wmc.162.1574840965411; Tue, 26 Nov 2019 23:49:25 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id n16sm4230831wro.88.2019.11.26.23.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 23:49:24 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Nov 2019 08:48:55 +0100 Message-Id: <20191127074858.32066-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 26/29] avformat/matroskaenc: Check return value of ff_isom_write_hvcc() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The Matroska muxer currently does not check the return value of ff_isom_write_hvcc(), the function used to write mp4-style HEVC-extradata as Matroska also uses it. This was intentionally done in 7a5356c72 to allow remuxing from mpeg-ts. But if ff_isom_write_hvcc() fails, it has not output anything and the file ends up without CodecPrivate and, if the input was annex b, with annex b data, which is against the spec. So check the return value again. The underlying issue of not having extradata seems to have been fixed by the introduction of the extract_extradata bitstream filter. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 43966a4378..6e1d575e3f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -707,9 +707,8 @@ static int mkv_write_native_codecprivate(AVFormatContext *s, AVIOContext *pb, return ff_isom_write_avcc(dyn_cp, par->extradata, par->extradata_size); case AV_CODEC_ID_HEVC: - ff_isom_write_hvcc(dyn_cp, par->extradata, - par->extradata_size, 0); - return 0; + return ff_isom_write_hvcc(dyn_cp, par->extradata, + par->extradata_size, 0); case AV_CODEC_ID_AV1: if (par->extradata_size) return ff_isom_write_av1c(dyn_cp, par->extradata,