RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg: replace AVFrame.pkt_duration with duration 

Mistakenly reintroduced in 4740fea7dd.
This commit is contained in:
Anton Khirnov 2022-07-23 12:52:02 +02:00
parent 23953b9eb7
commit 34cbda3ee1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fftools/ffmpeg.c
View File

@ -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:

2
fftools/sync_queue.c
View File

@ -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)