Merge commit '4426540f'

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

* commit '4426540f':
  avconv: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>