Merge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'

This commit is a no-op.

* commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266':
  buffersrc: do not discard the error from ff_filter_frame()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavfilter/buffersrc.c
index 3920b048db928fafca5569795b8461e43b8d9ebc,0079f51ae122178c60e786a8fbfbdae8748ad33c..c09379013caad3df140f91374506b3a26d3106ec
--- 1/libavfilter/buffersrc.c
--- 2/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@@ -370,6 -318,7 +370,7 @@@ static int request_frame(AVFilterLink *
  {
      BufferSourceContext *c = link->src->priv;
      AVFrame *frame;
 -    int ret = 0;
++    int ret;
  
      if (!av_fifo_size(c->fifo)) {
          if (c->eof)