Skip to content

Commit

Permalink
Fix issue2619.
Browse files Browse the repository at this point in the history
regression introduced in 1762d9c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information
michaelni committed Feb 19, 2011
1 parent 7782cb2 commit 5c20c81
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ffmpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
av_init_packet(&opkt);

if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
continue;
goto cont;

/* no reencoding needed : output the packet directly */
/* force the input stream PTS */
Expand Down Expand Up @@ -1746,6 +1746,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
ost->frame_number++;
av_free_packet(&opkt);
}
cont:
#if CONFIG_AVFILTER
frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);
Expand Down

0 comments on commit 5c20c81

Please sign in to comment.