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

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 <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-18 16:35:01 +02:00
parent 60f3291086
commit dece4f4693
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffmpeg.c
View File

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