diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 00:38:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 00:52:25 +0200 |
commit | 31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba (patch) | |
tree | 321a6eb57e018866779df59bc4ef6144d4780a40 /ffmpeg.c | |
parent | 48a40e09c4858c43627d9bc25efc3c47efdde5af (diff) | |
parent | 90c9edba58eddf39e77937a6c602d7ff289c9bfd (diff) | |
download | ffmpeg-streaming-31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba.zip ffmpeg-streaming-31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Replace some @file tags by more suitable markup.
fate: Set FUZZ factor of vorbis-13 test to 2.
fate: Set FUZZ factor of (e)ac3-encode test to 3.
fate: remove unused code from regressions-funcs.sh
rtmp: Don't assume path points to a string of nonzero length
avconv: fix behavior with -ss as an output option.
Conflicts:
doc/platform.texi
doc/protocols.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -2028,8 +2028,10 @@ static int poll_filters(void) //if (ost->source_index >= 0) // *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold - if (of->start_time && filtered_frame->pts < of->start_time) - return 0; + if (of->start_time && filtered_frame->pts < of->start_time) { + avfilter_unref_buffer(picref); + continue; + } switch (ost->filter->filter->inputs[0]->type) { case AVMEDIA_TYPE_VIDEO: |