Merge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:48:39 +0000 (19:48 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:48:39 +0000 (19:48 +0000)
commit9a9f3f151fa2d9cd66fdfdf72722465d11c296bb
tree34ddcde617607d17103d1e0f49ed4b03125f62f2
parentc82d31808bdcbafb1489cfb5d8e22c5272b484eb
parentfb25d99b0a5e21fb8cc184c7a9d3736387778266
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>
libavfilter/buffersrc.c