diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-02 04:32:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 01:04:18 +0200 |
| commit | 0f3cdddf3886ebd5abc8efad72bc193189c815bf (patch) | |
| tree | 4d19dbe52c870669ab566c333b80a2e361a819d8 | |
| parent | a0d13f578b8572a383106b07527fb437f70f3b50 (diff) | |
| download | ffmpeg-0f3cdddf3886ebd5abc8efad72bc193189c815bf.tar.gz | |
avfilter/vf_fps: make sure the fifo is not empty before using it
Fixes Ticket2905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cdd5df8189ff1537f7abe8defe971f80602cc2d2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_fps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 29eedc7cf5..d55b5dcff3 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -203,7 +203,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) } /* now wait for the next timestamp */ - if (buf->pts == AV_NOPTS_VALUE) { + if (buf->pts == AV_NOPTS_VALUE || av_fifo_size(s->fifo) <= 0) { return write_to_fifo(s->fifo, buf); } |