Merge commit '3799376dd3373ee255651ed542c75b15665801a8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:35:03 +0000 (09:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:35:03 +0000 (09:35 +0200)
* commit '3799376dd3373ee255651ed542c75b15665801a8':
  lavfi/fifo: fix flushing when using request_samples

Conflicts:
libavfilter/fifo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/fifo.c

index b06720ec17b14e832c3acdc3456cc81eafcd624c,a58ce9f7ab08ee085c8c8ba4950b9e8d2ca129b8..efc89685c93865f59fe46b4c22658095b349baa6
@@@ -227,9 -231,11 +231,12 @@@ static int request_frame(AVFilterLink *
      int ret = 0;
  
      if (!fifo->root.next) {
-         if ((ret = ff_request_frame(outlink->src->inputs[0])) < 0)
+         if ((ret = ff_request_frame(outlink->src->inputs[0])) < 0) {
+             if (ret == AVERROR_EOF && outlink->request_samples)
+                 return return_audio_frame(outlink->src);
              return ret;
+         }
 +        av_assert0(fifo->root.next);
      }
  
      if (outlink->request_samples) {