Merge commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 16:03:57 +0000 (16:03 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 16:03:57 +0000 (16:03 +0000)
commit10424024a16a7646169b9c9008c5f7b77cbc2211
treeea852976be3a8b8d0cd3d57bc1beb918b89991d0
parent6992276acaaee32b33bd5f6e2f0d89588c4ae59a
parentb3dd30db0b2d857147fc0e1461a00bd6172a26a3
Merge commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3'

* commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3':
  lavfi: pass the hw frames context through the filter chain

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
doc/APIchanges
doc/filters.texi
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/version.h