Merge commit '1bf34134612e509fa68c70dfff418c6022459259'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 16:39:01 +0000 (16:39 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 16:39:20 +0000 (16:39 +0000)
commit14f942b3598273e30556ca292b963b832b09015c
treeea852976be3a8b8d0cd3d57bc1beb918b89991d0
parent10424024a16a7646169b9c9008c5f7b77cbc2211
parent1bf34134612e509fa68c70dfff418c6022459259
Merge commit '1bf34134612e509fa68c70dfff418c6022459259'

This commit is a no-op.

* commit '1bf34134612e509fa68c70dfff418c6022459259':
  avconv: use the new buffersrc parameters API

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