Message ID | 20220723140952.31814-1-anton@khirnov.net |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel,01/27] fftools/ffmpeg: replace AVFrame.pkt_duration with duration | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Anton Khirnov: > Mistakenly reintroduced in 4740fea7ddf. > --- > fftools/ffmpeg.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index 632ac25cb2..841dd6f08a 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: Please apply this ASAP. - Andreas
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 632ac25cb2..841dd6f08a 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: