Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:50:06 +0000 (18:50 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:50:11 +0000 (18:50 +0100)
commit98e3153fa3a190df5c0a2173e134f81299606819
tree2e34226dbd4010774f6ffef448aab4b7d4f88544
parentaf9cac1be1750ecc0e12c6788a3aeed1f1a778be
parent4426540f0c3ee516662f79d0a6ab5b95503b6611
Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'

This commit is a no-op. We will do this when we convert ffmpeg.c

* commit '4426540f0c3ee516662f79d0a6ab5b95503b6611':
  avconv: switch to the new BSF API

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