Commit 5c20c81b authored by Michael Niedermayer's avatar Michael Niedermayer

Fix issue2619.

regression introduced in 1762d9ceSigned-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7782cb20
...@@ -1698,7 +1698,7 @@ static int output_packet(AVInputStream *ist, int ist_index, ...@@ -1698,7 +1698,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
av_init_packet(&opkt); av_init_packet(&opkt);
if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes) if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
continue; goto cont;
/* no reencoding needed : output the packet directly */ /* no reencoding needed : output the packet directly */
/* force the input stream PTS */ /* force the input stream PTS */
...@@ -1746,6 +1746,7 @@ static int output_packet(AVInputStream *ist, int ist_index, ...@@ -1746,6 +1746,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
ost->frame_number++; ost->frame_number++;
av_free_packet(&opkt); av_free_packet(&opkt);
} }
cont:
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]); ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);
......
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