Update patches for 7.1.3

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
2026-09-03 05:09:58 +03:00 · 2025-11-28 20:59:56 +08:00
parent 650e86cdcf
commit 14e7a0f1f0
5 changed files with 29 additions and 45 deletions
@@ -1,42 +0,0 @@
-Index: FFmpeg/libavcodec/decode.c
-===================================================================
--- FFmpeg.orig/libavcodec/decode.c
-+++ FFmpeg/libavcodec/decode.c
-@@ -2329,6 +2329,8 @@ void ff_decode_internal_sync(AVCodecCont
-     const DecodeContext *src_dc = decode_ctx(src->internal);
-     DecodeContext *dst_dc = decode_ctx(dst->internal);
- 
-+    dst_dc->initial_pict_type = src_dc->initial_pict_type;
-+    dst_dc->intra_only_flag   = src_dc->intra_only_flag;
-     ff_refstruct_replace(&dst_dc->lcevc, src_dc->lcevc);
- }
- 
-Index: FFmpeg/libavcodec/pthread_frame.c
-===================================================================
--- FFmpeg.orig/libavcodec/pthread_frame.c
-+++ FFmpeg/libavcodec/pthread_frame.c
-@@ -115,10 +115,6 @@ typedef struct PerThreadContext {
-     int hwaccel_threadsafe;
- 
-     atomic_int debug_threads;       ///< Set if the FF_DEBUG_THREADS option is set.
-
-    /// The following two fields have the same semantics as the DecodeContext field
-    int intra_only_flag;
-    enum AVPictureType initial_pict_type;
- } PerThreadContext;
- 
- /**
-@@ -821,13 +817,6 @@ static av_cold int init_thread(PerThread
-     AVCodecContext *copy;
-     int err;
- 
-    p->initial_pict_type = AV_PICTURE_TYPE_NONE;
-    if (avctx->codec_descriptor->props & AV_CODEC_PROP_INTRA_ONLY) {
-        p->intra_only_flag = AV_FRAME_FLAG_KEY;
-        if (avctx->codec_type == AVMEDIA_TYPE_VIDEO)
-            p->initial_pict_type = AV_PICTURE_TYPE_I;
-    }
-
-     atomic_init(&p->state, STATE_INPUT_READY);
- 
-     copy = av_memdup(avctx, sizeof(*avctx));
@@ -0,0 +1,26 @@
+Index: FFmpeg/libavfilter/framesync.c
+===================================================================
+--- FFmpeg.orig/libavfilter/framesync.c
+++ FFmpeg/libavfilter/framesync.c
+@@ -248,7 +248,7 @@ static void framesync_inject_frame(FFFra
+ 
+     av_assert0(!fs->in[in].have_next);
+     av_assert0(frame);
+-    pts = av_rescale_q(frame->pts, fs->in[in].time_base, fs->time_base);
+    pts = av_rescale_q_rnd(frame->pts, fs->in[in].time_base, fs->time_base, AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX);
+     frame->pts = pts;
+     fs->in[in].frame_next = frame;
+     fs->in[in].pts_next   = pts;
+Index: FFmpeg/libavfilter/vf_scale.c
+===================================================================
+--- FFmpeg.orig/libavfilter/vf_scale.c
+++ FFmpeg/libavfilter/vf_scale.c
+@@ -1119,7 +1119,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
+         goto err;
+ 
+     av_assert0(out);
+-    out->pts = av_rescale_q(fs->pts, fs->time_base, outlink->time_base);
+    out->pts = av_rescale_q_rnd(fs->pts, fs->time_base, outlink->time_base, AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX);
+     return ff_filter_frame(outlink, out);
+ 
+ err:
@@ -88,6 +88,6 @@
 0088-remove-el-when-stripping-dovi-metadata.patch
 0089-fix-avcodec-params-when-bsfs-are-enable-by-decoder.patch
 0090-dont-return-ext-error-for-invalid-vt-frame.patch
-0091-backport-a-fix-for-setting-values-in-lavc-decode.patch
-0092-backport-a-fix-for-stripping-fps-from-setpts-outlink.patch
-0093-add-hevc-recovery-point-support-backport-from-upstream.patch
+0091-backport-a-fix-for-stripping-fps-from-setpts-outlink.patch
+0092-add-hevc-recovery-point-support-backport-from-upstream.patch
+0093-backport-a-fix-for-unnecessary-rescale-av-nopts-in-lavfi.patch