Browse Source

Move frame_available computation to where it belongs in ffmpeg.c.

This fixes a infinite loop.
Fixes issue 2066.

Originally committed as revision 24058 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Michael Niedermayer 15 years ago
parent
commit
748db0fcc4
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      ffmpeg.c

+ 2
- 4
ffmpeg.c View File

@@ -1773,13 +1773,11 @@ static int output_packet(AVInputStream *ist, int ist_index,
av_free_packet(&opkt);
}
}
#if CONFIG_AVFILTER
frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]);
#endif
}

#if CONFIG_AVFILTER
frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
ist->out_video_filter && avfilter_poll_frame(ist->out_video_filter->inputs[0]);
if(ist->picref)
avfilter_unref_pic(ist->picref);
}


Loading…
Cancel
Save