@@ -1112,16 +1112,9 @@ static int do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame)
int64_t nb_frames, nb_frames_prev, i;
double duration = 0;
- if (frame) {
- FrameData *fd = frame_data(frame);
-
+ if (frame)
duration = lrintf(frame->duration * av_q2d(frame->time_base) / av_q2d(enc->time_base));
- if (duration <= 0 &&
- fd->frame_rate_filter.num > 0 && fd->frame_rate_filter.den > 0)
- duration = 1 / (av_q2d(fd->frame_rate_filter) * av_q2d(enc->time_base));
- }
-
video_sync_process(of, ost, frame, duration,
&nb_frames, &nb_frames_prev);
@@ -1807,8 +1807,14 @@ int reap_filters(FilterGraph *fg, int flush)
if (ost->type == AVMEDIA_TYPE_VIDEO) {
AVRational fr = av_buffersink_get_frame_rate(filter);
- if (fr.num > 0 && fr.den > 0)
+ if (fr.num > 0 && fr.den > 0) {
fd->frame_rate_filter = fr;
+
+ if (!filtered_frame->duration) {
+ filtered_frame->duration = av_rescale_q(1, av_inv_q(fr),
+ filtered_frame->time_base);
+ }
+ }
}
ret = enc_frame(ost, filtered_frame);
@@ -1,3 +1,3 @@
0638c4d073ac224608baaba16732b68f *tests/data/lavf/lavf.gxf
795876 tests/data/lavf/lavf.gxf
-tests/data/lavf/lavf.gxf CRC=0x5ade0285
+tests/data/lavf/lavf.gxf CRC=0xe032707a
@@ -1,3 +1,3 @@
9a27673c85f1671ba9ff7cd33e5735de *tests/data/lavf/lavf.gxf_ntsc
794660 tests/data/lavf/lavf.gxf_ntsc
-tests/data/lavf/lavf.gxf_ntsc CRC=0xdcd39443
+tests/data/lavf/lavf.gxf_ntsc CRC=0xaf956c57
@@ -1,3 +1,3 @@
4d1bd16c6d52468c05711d8301e4e302 *tests/data/lavf/lavf.gxf_pal
795880 tests/data/lavf/lavf.gxf_pal
-tests/data/lavf/lavf.gxf_pal CRC=0x1dbfef76
+tests/data/lavf/lavf.gxf_pal CRC=0x34fe5d7a