[FFmpeg-cvslog] avfilter/vf_fps: make sure the fifo is not empty before using it

[Michael Niedermayer]

ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  2 04:32:23 2013 +0200| [ceff07dfb94af00233979ccd1cf6587b91a44d5f] | committer: Michael Niedermayer

avfilter/vf_fps: make sure the fifo is not empty before using it

Fixes Ticket2905

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cdd5df8189ff1537f7abe8defe971f80602cc2d2)

Conflicts:

	libavfilter/vf_fps.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ceff07dfb94af00233979ccd1cf6587b91a44d5f
---

 libavfilter/vf_fps.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index d12070c..1be055b 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -193,7 +193,7 @@ static void end_frame(AVFilterLink *inlink)
     }
 
     /* now wait for the next timestamp */
-    if (buf->pts == AV_NOPTS_VALUE) {
+    if (buf->pts == AV_NOPTS_VALUE || av_fifo_size(s->fifo) <= 0) {
         write_to_fifo(s->fifo, buf);
         return;
     }