Commit 69a63801 authored by Anton Khirnov's avatar Anton Khirnov

avconv: fix -frames for video

For video, frame_number tracks the number of frames sent to the encoder.
So it should be incremented when we submit a frame, not when we get a
packet back.
parent 83f230c2
......@@ -537,6 +537,12 @@ static void do_video_out(AVFormatContext *s,
if (ret < 0)
goto error;
/*
* For video, there may be reordering, so we can't throw away frames on
* encoder flush, we need to limit them here, before they go into encoder.
*/
ost->frame_number++;
while (1) {
ret = avcodec_receive_packet(enc, &pkt);
if (ret == AVERROR(EAGAIN))
......@@ -554,12 +560,6 @@ static void do_video_out(AVFormatContext *s,
}
ost->sync_opts++;
/*
* For video, number of frames in == number of packets out.
* But there may be reordering, so we can't throw away frames on encoder
* flush, we need to limit them here, before they go into encoder.
*/
ost->frame_number++;
}
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment