har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vf_fps: add more error checks.

Browse Source
This commit is contained in:
Anton Khirnov 2012-07-15 10:07:59 +02:00
parent d515e9c225
commit 043800a968
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavfilter/vf_fps.c
View File

@ -184,7 +184,10 @@ static int end_frame(AVFilterLink *inlink)
/* discard frames until we get the first timestamp */ /* discard frames until we get the first timestamp */
if (s->pts == AV_NOPTS_VALUE) { if (s->pts == AV_NOPTS_VALUE) {
if (buf->pts != AV_NOPTS_VALUE) { if (buf->pts != AV_NOPTS_VALUE) {
write_to_fifo(s->fifo, buf); ret = write_to_fifo(s->fifo, buf);
if (ret < 0)
return ret;
s->first_pts = s->pts = buf->pts; s->first_pts = s->pts = buf->pts;
} else { } else {
av_log(ctx, AV_LOG_WARNING, "Discarding initial frame(s) with no " av_log(ctx, AV_LOG_WARNING, "Discarding initial frame(s) with no "
@ -227,8 +230,20 @@ static int end_frame(AVFilterLink *inlink)
/* duplicate the frame if needed */ /* duplicate the frame if needed */
if (!av_fifo_size(s->fifo) && i < delta - 1) { if (!av_fifo_size(s->fifo) && i < delta - 1) {
AVFilterBufferRef *dup = avfilter_ref_buffer(buf_out, AV_PERM_READ);
av_log(ctx, AV_LOG_DEBUG, "Duplicating frame.\n"); av_log(ctx, AV_LOG_DEBUG, "Duplicating frame.\n");
write_to_fifo(s->fifo, avfilter_ref_buffer(buf_out, AV_PERM_READ)); if (dup)
ret = write_to_fifo(s->fifo, dup);
else
ret = AVERROR(ENOMEM);
if (ret < 0) {
avfilter_unref_bufferp(&buf_out);
avfilter_unref_bufferp(&buf);
return ret;
}
s->dup++; s->dup++;
} }