[FFmpeg-cvslog] Merge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 19:48:39 2016 +0000| [9a9f3f151fa2d9cd66fdfdf72722465d11c296bb] | committer: Derek Buitenhuis

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a9f3f151fa2d9cd66fdfdf72722465d11c296bb
---