[FFmpeg-cvslog] fftools/ffmpeg: replace AVFrame.pkt_duration with duration

Anton Khirnov git at videolan.org
Sun Jul 24 09:59:05 EEST 2022


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Jul 23 12:52:02 2022 +0200| [34cbda3ee193a793dea396314d7d11f8c4108fc3] | committer: Anton Khirnov

fftools/ffmpeg: replace AVFrame.pkt_duration with duration

Mistakenly reintroduced in 4740fea7ddf.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34cbda3ee193a793dea396314d7d11f8c4108fc3
---

 fftools/ffmpeg.c     | 6 +++---
 fftools/sync_queue.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 1089cc48c4..b03f18cfea 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1216,18 +1216,18 @@ static void do_video_out(OutputFile *of,
                 if (delta0 > 1.1)
                     nb0_frames = llrintf(delta0 - 0.6);
             }
-            next_picture->pkt_duration = 1;
+            next_picture->duration = 1;
             break;
         case VSYNC_VFR:
             if (delta <= -0.6)
                 nb_frames = 0;
             else if (delta > 0.6)
                 ost->sync_opts = llrint(sync_ipts);
-            next_picture->pkt_duration = duration;
+            next_picture->duration = duration;
             break;
         case VSYNC_DROP:
         case VSYNC_PASSTHROUGH:
-            next_picture->pkt_duration = duration;
+            next_picture->duration = duration;
             ost->sync_opts = llrint(sync_ipts);
             break;
         default:
diff --git a/fftools/sync_queue.c b/fftools/sync_queue.c
index 3143d12cf1..c2b23ee4f5 100644
--- a/fftools/sync_queue.c
+++ b/fftools/sync_queue.c
@@ -76,7 +76,7 @@ static int64_t frame_ts(const SyncQueue *sq, SyncQueueFrame frame)
 {
     return (sq->type == SYNC_QUEUE_PACKETS) ?
            frame.p->pts + frame.p->duration :
-           frame.f->pts + frame.f->pkt_duration;
+           frame.f->pts + frame.f->duration;
 }
 
 static int frame_null(const SyncQueue *sq, SyncQueueFrame frame)



More information about the ffmpeg-cvslog mailing list