[FFmpeg-cvslog] Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 17 18:50:06 2016 +0100| [98e3153fa3a190df5c0a2173e134f81299606819] | committer: Derek Buitenhuis

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98e3153fa3a190df5c0a2173e134f81299606819
---