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)
* cigaes/master:
  lavfi/trim: mark link closed on EOF.
  ffmpeg: ignore EOF when pushing frames to filters.

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

Trivial merge