From dece4f46931cc7870f7ee7022522225b5f49e709 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 18 Jul 2012 16:35:01 +0200 Subject: ffmpeg: revert 3ba90d9 (cosmetics to reduce difference to qatar by about 90 lines) This commit caused Ticket1490 (Infinity loop / lock in export image) Signed-off-by: Michael Niedermayer --- ffmpeg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 03fdcbc481..26dd3a1df3 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1723,7 +1723,7 @@ static void do_video_out(AVFormatContext *s, int ret, format_video_sync; AVPacket pkt; AVCodecContext *enc = ost->st->codec; - int nb_frames; + int nb_frames, i; double sync_ipts, delta; double duration = 0; int frame_size = 0; @@ -1782,8 +1782,8 @@ static void do_video_out(AVFormatContext *s, av_log(NULL, AV_LOG_VERBOSE, "*** %d dup!\n", nb_frames - 1); } - -duplicate_frame: + /* duplicates frame if needed */ + for (i = 0; i < nb_frames; i++) { av_init_packet(&pkt); pkt.data = NULL; pkt.size = 0; @@ -1874,9 +1874,7 @@ duplicate_frame: * flush, we need to limit them here, before they go into encoder. */ ost->frame_number++; - - if(--nb_frames) - goto duplicate_frame; + } if (vstats_filename && frame_size) do_video_stats(output_files[ost->file_index]->ctx, ost, frame_size); -- cgit v1.2.3