Merge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:39:06 +0000 (15:39 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:39:06 +0000 (15:39 +0200)
* commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e':
  avconv: fix parsing bitstream filters

Not merged because ffmpeg_opt.c still uses the old BSF API.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge