From patchwork Fri Jan 22 11:01:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25073 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 42D4144A315 for ; Fri, 22 Jan 2021 13:02:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1005468A1CC; Fri, 22 Jan 2021 13:02:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4784680BED for ; Fri, 22 Jan 2021 13:02:07 +0200 (EET) Received: by mail-wr1-f53.google.com with SMTP id a1so4666278wrq.6 for ; Fri, 22 Jan 2021 03:02:07 -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:mime-version :content-transfer-encoding; bh=hFv508AwxFECG7hy19DHpvLghCSkzyuig21+Iaa4pFY=; b=jvz8hU4OrZ4BsRQnzE/yA+DtBdbX9FaR8dexWyeI87xtUkGEotSWlXvoVIyt6p0m+C bxDdy0QbXN0ailbG7mX3d8MCi3pHbdebaKfHOfVCe+dirnil3MH5OPuzrVjP7vhJ7rOB /51wwvtD6mbsykMwxkePraoP0gk6ZjmyG8H3tVjOXZd5GjE5eJqVLHZjawblW5BfeKpT Jz1i/EYLPglpjZ4QX7YsxxKA3W1qRT/e2N4BL6WQvpZkrlWKw6t1EFLAr+8kZjQK23dC 37Luw82uYcUT1ub1zSYDPfgn7pu1li5ny+cZF9TA9aIHytaztnV95/NhY/Dle9G8aF3g eepQ== 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:mime-version :content-transfer-encoding; bh=hFv508AwxFECG7hy19DHpvLghCSkzyuig21+Iaa4pFY=; b=TA035n8PZ/Jcgh27qrg9G5fShU7ne1yRYuEaoqxGYwrtdFpQKczJOAHy4I/PVeFR7P dFtuQknXqFVz8LaR4lDVbIktKZu5ouHciAN/sFxagDj6JFFqtcDG7pexoJyBFL24DeSp 3AxKvvaJ8cdm0KZHiW8A6T0L1OP9E9UUwoYgpuOnaIE5eSIZdo/B5TRfRc63RuopDVvF 6ewe2hK4K8Yl1/Whz+smxtmKI5+NlMWerdA/1F+szBbl8ZZoqYv1TFRZT2zmp66s8qZW kEOG2oI46igetI3Gjzf6qwoQSKmOyQOSeG8mx10rR3KW7pHJNoqkk5bJ7kmCW3zqiz/+ t1QQ== X-Gm-Message-State: AOAM532xhBFjlrxHYEM7HdfBlXEtcQu3/Z009E2pCiGuLjyMuKKqGTI3 x1DDnbjWeogl4B4jtTff9G5BQLtvZ5o= X-Google-Smtp-Source: ABdhPJxd99bKS849eQhfj6CzEcL6aAnQjZ/+hk4KCoSeCAy6yKjoxch6EStO79Dd7JinX3cliVvodw== X-Received: by 2002:a5d:5501:: with SMTP id b1mr4056758wrv.162.1611313327014; Fri, 22 Jan 2021 03:02:07 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm11369406wmh.14.2021.01.22.03.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 03:02:06 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Jan 2021 12:01:58 +0100 Message-Id: <20210122110158.251251-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: Fix SEI enum identifiers 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" Broken in 64b3aac8d07a8744656737619b70977359d9a6a5. Signed-off-by: Andreas Rheinhardt --- Untested as I do not use OSX. libavcodec/videotoolboxenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index a333a9a10c..c487d2dc60 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1751,7 +1751,7 @@ static int copy_replace_length_codes( remaining_dst_size--; wrote_bytes = write_sei(sei, - SEI_TYPE_USER_DATA_REGISTERED, + SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35, dst_data, remaining_dst_size); @@ -1807,7 +1807,7 @@ static int copy_replace_length_codes( return status; wrote_bytes = write_sei(sei, - SEI_TYPE_USER_DATA_REGISTERED, + SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35, new_sei, remaining_dst_size - old_sei_length); if (wrote_bytes < 0) @@ -1903,7 +1903,7 @@ static int vtenc_cm_to_avpacket( if (sei) { size_t msg_size = get_sei_msg_bytes(sei, - SEI_TYPE_USER_DATA_REGISTERED); + SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35); sei_nalu_size = sizeof(start_code) + 1 + msg_size + 1; }