Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 00:59:10 +0000 (02:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 00:59:14 +0000 (02:59 +0200)
commit2976e2a102cd8202e0f7b9e601d62354b7ad1c72
treeb0b2663c448af7ee268e74414f62e94bbefcc581
parentd2021f74ed5e14d2675065550ff95a225c0b60cf
parent50a4d076ce630db9b5b72c3e6348970e13ae1fb6
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/trim: mark link closed on EOF.
  ffmpeg: ignore EOF when pushing frames to filters.

Merged-by: Michael Niedermayer <michaelni@gmx.at>