lavfi/fifo: do not assume request_frame() returns a frame.

This commit is contained in:
Nicolas George 2015-10-22 09:57:34 +02:00
parent 79c1be124e
commit 67d3f5296e

View File

@ -201,7 +201,8 @@ static int return_audio_frame(AVFilterContext *ctx)
break; break;
} else if (ret < 0) } else if (ret < 0)
return ret; return ret;
av_assert0(s->root.next); // If ff_request_frame() succeeded then we should have a frame if (!s->root.next)
return 0;
} }
head = s->root.next->frame; head = s->root.next->frame;
@ -237,7 +238,8 @@ static int request_frame(AVFilterLink *outlink)
return return_audio_frame(outlink->src); return return_audio_frame(outlink->src);
return ret; return ret;
} }
av_assert0(fifo->root.next); if (!fifo->root.next)
return 0;
} }
if (outlink->request_samples) { if (outlink->request_samples) {