Commit 422d2980ff for ffmpeg

commit 422d2980ff27a37c81ebb06ba5faaafb0977ca64
Author: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date:   Thu Nov 12 19:25:46 2026 -0800

    avcodec/frame_thread_encoder: set frame_num in the worker threads

    Worker contexts always saw frame_num 0, so the dv encoder wrote all
    720p frames as the first half of a frame pair.

    Signed-off-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>

diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index 6af3db722e..f0306c134c 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -44,6 +44,7 @@
 typedef struct{
     AVFrame  *indata;
     AVPacket *outdata;
+    int64_t   frame_num;
     int       return_code;
     int       finished;
     int       got_packet;
@@ -64,6 +65,7 @@ typedef struct{
     unsigned next_task_index;
     unsigned task_index;
     unsigned finished_task_index;
+    int64_t  frame_num;              ///< number of frames submitted

     pthread_t worker[MAX_THREADS];
     atomic_int exit;
@@ -104,6 +106,7 @@ static void * attribute_align_arg worker(void *v){
         task  = &c->tasks[task_index];
         frame = task->indata;
         pkt   = task->outdata;
+        avctx->frame_num = task->frame_num;

         ret = ff_encode_encode_cb(avctx, pkt, frame, &task->got_packet);
         pthread_mutex_lock(&c->finished_task_mutex);
@@ -308,6 +311,7 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt,

     if(frame){
         av_frame_move_ref(c->tasks[c->task_index].indata, frame);
+        c->tasks[c->task_index].frame_num = c->frame_num++;

         pthread_mutex_lock(&c->task_fifo_mutex);
         c->task_index = (c->task_index + 1) % c->max_tasks;
diff --git a/tests/fate/dvvideo.mak b/tests/fate/dvvideo.mak
index 33686d7762..7955f5068e 100644
--- a/tests/fate/dvvideo.mak
+++ b/tests/fate/dvvideo.mak
@@ -6,3 +6,12 @@ FATE_DVVIDEO-$(call ALLYES, MOV_DEMUXER DV_ERROR_MARKER_BSF NOISE_BSF AVI_MUXER)

 FATE_SAMPLES_FFMPEG += $(FATE_DVVIDEO-yes)
 fate-dvvideo: $(FATE_DVVIDEO-yes)
+
+# Three workers give an odd-sized task ring; seven frames cross its wraparound.
+FATE_DVVIDEO_SYNTH-$(call ALLYES, LAVFI_INDEV TESTSRC2_FILTER FORMAT_FILTER WRAPPED_AVFRAME_DECODER DVVIDEO_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL FRAME_THREAD_ENCODER) += fate-dvvideo-720p50-frame-threads fate-dvvideo-720p60-frame-threads
+fate-dvvideo-720p50-frame-threads: RATE = 50
+fate-dvvideo-720p60-frame-threads: RATE = 60000/1001
+fate-dvvideo-720p50-frame-threads fate-dvvideo-720p60-frame-threads: CMD = framecrc -f lavfi -i testsrc2=size=960x720:rate=$(RATE),format=yuv422p -frames:v 7 -c:v dvvideo -dct int -threads 3 -thread_type frame
+
+FATE_FFMPEG += $(FATE_DVVIDEO_SYNTH-yes)
+fate-dvvideo: $(FATE_DVVIDEO_SYNTH-yes)
diff --git a/tests/ref/fate/dvvideo-720p50-frame-threads b/tests/ref/fate/dvvideo-720p50-frame-threads
new file mode 100644
index 0000000000..d0517985c8
--- /dev/null
+++ b/tests/ref/fate/dvvideo-720p50-frame-threads
@@ -0,0 +1,12 @@
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: dvvideo
+#dimensions 0: 960x720
+#sar 0: 1/1
+0,          0,          0,        1,   288000, 0xcc595292
+0,          1,          1,        1,   288000, 0xd7f5ec89
+0,          2,          2,        1,   288000, 0x129815cf
+0,          3,          3,        1,   288000, 0xf3d65d84
+0,          4,          4,        1,   288000, 0xc7972412
+0,          5,          5,        1,   288000, 0x1c371f4b
+0,          6,          6,        1,   288000, 0xc00229a0
diff --git a/tests/ref/fate/dvvideo-720p60-frame-threads b/tests/ref/fate/dvvideo-720p60-frame-threads
new file mode 100644
index 0000000000..fdee03d14d
--- /dev/null
+++ b/tests/ref/fate/dvvideo-720p60-frame-threads
@@ -0,0 +1,12 @@
+#tb 0: 1001/60000
+#media_type 0: video
+#codec_id 0: dvvideo
+#dimensions 0: 960x720
+#sar 0: 1/1
+0,          0,          0,        1,   240000, 0x059a19c3
+0,          1,          1,        1,   240000, 0xb5c72482
+0,          2,          2,        1,   240000, 0x601b7e81
+0,          3,          3,        1,   240000, 0x0f7645e6
+0,          4,          4,        1,   240000, 0x68c611af
+0,          5,          5,        1,   240000, 0x779d661e
+0,          6,          6,        1,   240000, 0xea44860b