diff --git a/Dockerfile b/Dockerfile index da82293..a3b70a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -890,13 +890,9 @@ RUN \ https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \ tar -jx --strip-components=1 -C /tmp/ffmpeg -# Apply patch for svt-av1: https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/2249#note_2361478864 -COPY /ffmpeg_n7_fix.patch /tmp/ffmpeg/ - RUN \ echo "**** compiling ffmpeg ****" && \ cd /tmp/ffmpeg && \ - patch -p1 < ffmpeg_n7_fix.patch && \ ./configure \ --disable-debug \ --disable-doc \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2cf453f..8887f3d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -640,14 +640,10 @@ RUN \ curl -Lf \ https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \ tar -jx --strip-components=1 -C /tmp/ffmpeg - - # Apply patch for svt-av1: https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/2249#note_2361478864 - COPY /ffmpeg_n7_fix.patch /tmp/ffmpeg/ RUN \ echo "**** compiling ffmpeg ****" && \ cd /tmp/ffmpeg && \ - patch -p1 < ffmpeg_n7_fix.patch && \ ./configure \ --disable-debug \ --disable-doc \ diff --git a/ffmpeg_n7_fix.patch b/ffmpeg_n7_fix.patch deleted file mode 100644 index 1c876a5..0000000 --- a/ffmpeg_n7_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c -index 8fa42d590b..e99c656c5d 100644 ---- a/libavcodec/libsvtav1.c -+++ b/libavcodec/libsvtav1.c -@@ -430,7 +430,7 @@ static av_cold int eb_enc_init(AVCodecContext *avctx) - - svt_enc->eos_flag = EOS_NOT_REACHED; - -- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params); -+ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params); - if (svt_ret != EB_ErrorNone) { - return svt_print_error(avctx, svt_ret, "Error initializing encoder handle"); - }