diff --git a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk index 2d2c5d816f..0d533a8290 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="x264" -PKG_VERSION="ff620d0c3c4f717ab393892983d43458d27e4bed" -PKG_SHA256="c6945fe9c3cdd7b0d2f89250ae696a51db59e3506af4d28d03616c9edd1e519b" +PKG_VERSION="b35605ace3ddf7c1a5d67a2eb553f034aef41d55" +PKG_SHA256="6eeb82934e69fd51e043bd8c5b0d152839638d1ce7aa4eea65a3fedcf83ff224" PKG_LICENSE="GPL" PKG_SITE="http://www.videolan.org/developers/x264.html" PKG_URL="https://code.videolan.org/videolan/x264/-/archive/${PKG_VERSION}/x264-${PKG_VERSION}.tar.bz2" diff --git a/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-0001-fix-NULL-dereference-if-no-frames-before-end-of-stream.patch b/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-0001-fix-NULL-dereference-if-no-frames-before-end-of-stream.patch new file mode 100644 index 0000000000..607c3803b5 --- /dev/null +++ b/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-0001-fix-NULL-dereference-if-no-frames-before-end-of-stream.patch @@ -0,0 +1,103 @@ +From patchwork Sat Jul 19 07:08:36 2025 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: James Hutchinson +X-Patchwork-Id: 56391 +Return-Path: +X-Original-To: ffmpeg-patchwork@ffmpeg.org +Delivered-To: ffmpeg-patchwork@ffmpeg.org +Received: from [127.0.1.1] (localhost [127.0.0.1]) + by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id DE79168C231; + Sat, 19 Jul 2025 10:09:04 +0300 (EEST) +X-Original-To: ffmpeg-devel@ffmpeg.org +Delivered-To: ffmpeg-devel@ffmpeg.org +Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com + [209.85.218.52]) + by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9A95468BDD6 + for ; Sat, 19 Jul 2025 10:08:58 +0300 (EEST) +Received: by mail-ej1-f52.google.com with SMTP id + a640c23a62f3a-ae0b2ead33cso479703566b.0 + for ; Sat, 19 Jul 2025 00:08:58 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20230601; t=1752908937; x=1753513737; + h=content-transfer-encoding:mime-version:message-id:date:subject:cc + :to:from:x-gm-message-state:from:to:cc:subject:date:message-id + :reply-to; + bh=2dgePZ7nkFD/l9ba1w+iqvJ6bPcp8CnRMMdiL89sQjs=; + b=fxolVU0f6lC0bG62RAIWwzdNb0Ppc0I5FcIyXCD5S/BUbkyRidOe9gUQMdM6tyeQke + EYPR6GppfEhkNYOrO09L7D8eFUpmaVPXsDt24HP3SAl1bDoEZNzV6N+emcefHoAtedUR + 59bMG7xU/DrhH1zVncryNMzReTZMTzkkFg1rK3jpcSpXRjsUHd3Eeyp5a05TMZDQhjYk + Gs1Qp3ceFgKX7Awinhu7EtqpCSmjwsJkkqPKberRQO5UWXdBTU9n4lwKKbq8pE3tDRk9 + 4jOwcrm1q4MGkB651KZO9uqJ4d926eUoyNgg1+5dMVI6WM0NXDWTd/SGUzNev1XHi95e + EG8w== +X-Gm-Message-State: AOJu0YwfLUWzpx354L+DikUVlulayk7JaPxt4+5IcAk7h+4Tw0vmjQJj + pR04G7AQ7uHdjZfFDelg2ysc2vqWfZGi7nquGv95cEtNvVSmgvUloWiGZms7lQ== +X-Gm-Gg: ASbGncveUGNDyMLnqtJmHj5HXzox/EZLHd4frYqSlTnViB3dlI326N2JlbHOMaJSntE + wBoDnCvmXESMt/FG7vsvHl6qfLXdF80ZJUbMrVDMtvz2iSMl5vpXCM7EQFNEgreGEUclG11RZ4B + nHBYO+swzV/yx293i5VqeEfmQGq4XChY8OjQZG8hwtowYnsvgqut0/G7kLtnaty2BEWklG/s5iW + Q4GZyJ7cfmiqfWGejZsD24Q1sFGQFd9iWef3tW0XNeotu3G2pWFP/BiGr07HgR2Motb5c+HnVFw + 1xgoKFUUa30G1lRjBTQqhIudGa2UWAhiaPFhHjvkbxG9TKV+cCblsVuq1hZKEXeYN9hahIw0jRp + qWIXTuzp8PjqqIKiscruZb7CIC6eTzEoO4EYPCk/hNqA= +X-Google-Smtp-Source: + AGHT+IFBbNh6HR778NSqbSozK3zA6zgI09LiaJY3EpoIFGzahtWIAa16h5k79lnzQGZqPjn8qMYedg== +X-Received: by 2002:a17:906:d7c7:b0:ae0:7e95:fb with SMTP id + a640c23a62f3a-aec65abd4a4mr609160766b.5.1752908937148; + Sat, 19 Jul 2025 00:08:57 -0700 (PDT) +Received: from mediapc.localdomain ([193.28.38.52]) + by smtp.gmail.com with ESMTPSA id + a640c23a62f3a-aec6c79cd11sm252704466b.16.2025.07.19.00.08.56 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Sat, 19 Jul 2025 00:08:56 -0700 (PDT) +To: ffmpeg-devel@ffmpeg.org +Date: Sat, 19 Jul 2025 08:08:36 +0100 +Message-ID: <20250719070836.283597-1-jahutchinson99@googlemail.com> +X-Mailer: git-send-email 2.50.1 +MIME-Version: 1.0 +Subject: [FFmpeg-devel] [PATCH] avcodec/hw_base_encode: fix NULL dereference + if no frames before end-of-stream +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: , + +X-Patchwork-Original-From: James Hutchinson via ffmpeg-devel + +From: James Hutchinson +Reply-To: FFmpeg development discussions and patches +Cc: James Hutchinson +Errors-To: ffmpeg-devel-bounces@ffmpeg.org +Sender: "ffmpeg-devel" + +If hw_base_encode_send_frame() is called with frame == NULL before any +input frames are submitted, ctx->pic_end is NULL and dereferencing it +causes a crash. This can occur in hardware encoding pipelines that flush +before receiving any input frames. + +Fix by checking ctx->pic_end before accessing its pts field. + +Link: https://github.com/tvheadend/tvheadend/issues/1833 +Signed-off-by: James Hutchinson +--- + libavcodec/hw_base_encode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c +index 33a30c8d10..7aa8aeedb1 100644 +--- a/libavcodec/hw_base_encode.c ++++ b/libavcodec/hw_base_encode.c +@@ -504,7 +504,7 @@ static int hw_base_encode_send_frame(AVCodecContext *avctx, FFHWBaseEncodeContex + + // Fix timestamps if we hit end-of-stream before the initial decode + // delay has elapsed. +- if (ctx->input_order <= ctx->decode_delay) ++ if (ctx->input_order <= ctx->decode_delay && ctx->pic_end) + ctx->dts_pts_diff = ctx->pic_end->pts - ctx->first_pts; + } + diff --git a/packages/addons/service/nextpvr/package.mk b/packages/addons/service/nextpvr/package.mk index 76cea4d0ab..8054c37b52 100644 --- a/packages/addons/service/nextpvr/package.mk +++ b/packages/addons/service/nextpvr/package.mk @@ -4,7 +4,7 @@ PKG_NAME="nextpvr" PKG_VERSION="7.0.1~Piers" PKG_ADDON_VERSION="7.0.1~1" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="NextPVR" PKG_SITE="https://nextpvr.com" diff --git a/packages/addons/service/tvheadend43/package.mk b/packages/addons/service/tvheadend43/package.mk index 1d37e097fc..605439a7ec 100644 --- a/packages/addons/service/tvheadend43/package.mk +++ b/packages/addons/service/tvheadend43/package.mk @@ -2,10 +2,10 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tvheadend43" -PKG_VERSION="f1c460feba34491d473c60216bd35eccc73c178e" -PKG_SHA256="1715ab016e5934908d71c486c50b5ecfc3009f55bacea8f73c87c3ee8e574457" -PKG_VERSION_NUMBER="4.3-2433" -PKG_REV="3" +PKG_VERSION="7cbe50c6e646e0d2443ef5bd73ba3c49c3c632c3" +PKG_SHA256="803276477ec580250c2203c1bcf2b75de1ae8758693b279aa21b0aea3c094384" +PKG_VERSION_NUMBER="4.3-2466" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org" diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index 3c71772fed..4af5971c80 100644 --- a/packages/addons/tools/ffmpeg-tools/package.mk +++ b/packages/addons/tools/ffmpeg-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="ffmpeg-tools" PKG_VERSION="1.0" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv"