]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Co-authored-by: Flole998 <9951871+Flole998@users.noreply.github.com> copilot/test-oldest-ffmpeg-version 1981/head
authorcopilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Wed, 29 Oct 2025 16:19:01 +0000 (16:19 +0000)
committercopilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Wed, 29 Oct 2025 16:19:01 +0000 (16:19 +0000)
Makefile.ffmpeg
support/patches/ffmpeg.libx264-5.0.diff [new file with mode: 0644]

index fac36c7deb9a3c3c5cc515eab81ac33e7a9d9966..fabaed590fd98560e486b8477fd16f35d1e6fecb 100644 (file)
@@ -106,10 +106,10 @@ FFNVCODEC_TB   = $(FFNVCODEC).tar.gz
 FFNVCODEC_URL  = https://github.com/FFmpeg/nv-codec-headers/releases/download/n$(FFNVCODEC_VER)/nv-codec-headers-$(FFNVCODEC_VER).tar.gz
 FFNVCODEC_SHA1 = 74231bb5572ebde98652a26ce98ede7895b4c730
 
-FFMPEG         = ffmpeg-2.8
+FFMPEG         = ffmpeg-5.0
 FFMPEG_TB      = $(FFMPEG).tar.bz2
 FFMPEG_URL     = https://ffmpeg.org/releases/$(FFMPEG_TB)
-FFMPEG_SHA1    = b57cbd0d6c9e6ae48edcfce9a46765eeb7291efc
+FFMPEG_SHA1    = 17cdbf4f15230c22a2b60cde2d21dc71c7d2241f
 
 
 # ##############################################################################
diff --git a/support/patches/ffmpeg.libx264-5.0.diff b/support/patches/ffmpeg.libx264-5.0.diff
new file mode 100644 (file)
index 0000000..ed20a06
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urN ../ffmpeg-5.0.orig/libavcodec/libx264.c ./libavcodec/libx264.c
+--- ../ffmpeg-5.0.orig/libavcodec/libx264.c2022-01-14 19:45:00.000000000 +0000
++++ ./libavcodec/libx264.c2025-10-29 16:00:00.000000000 +0000
+@@ -1097,7 +1097,7 @@
+ static const AVOption options[] = {
+     { "preset",        "Set the encoding preset (cf. x264 --fullhelp)",   OFFSET(preset),        AV_OPT_TYPE_STRING, { .str = "medium" }, 0, 0, VE},
+     { "tune",          "Tune the encoding params (cf. x264 --fullhelp)",  OFFSET(tune),          AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE},
+-    { "profile",       "Set profile restrictions (cf. x264 --fullhelp) ", OFFSET(profile),       AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE},
++    { "x264profile",       "Set profile restrictions (cf. x264 --fullhelp) ", OFFSET(profile),       AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE},
+     { "fastfirstpass", "Use fast settings when encoding first pass",      OFFSET(fastfirstpass), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE},
+     {"level", "Specify level (as defined by Annex A)", OFFSET(level), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE},
+     {"passlogfile", "Filename for 2 pass stats", OFFSET(stats), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE},