Merge commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:08:03 +0000 (17:08 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:08:13 +0000 (17:08 +0000)
commit259fef86bb91784f31a7e43e0d6d6a2a1d86f41c
tree7cdea83a0a7d2902ecb6d5fe29c5b22c8062016f
parente05704bd46b9107af25204dff47bd8b034868ae4
parentc15f6098b1b25689dd5e86aeb5ce69bc12efe1e1
Merge commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1'

* commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1':
  avconv: pass the hw context from filters to the encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
ffmpeg.c