[FFmpeg-cvslog] Merge commit '064f19f39e2f17927278c6ad8fe884a5b92310d6'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Mar 27 18:50:27 2017 -0300| [47c2ce2f75cd789fb7dc658c51bb4118a14628e2] | committer: James Almer

Merge commit '064f19f39e2f17927278c6ad8fe884a5b92310d6'

* commit '064f19f39e2f17927278c6ad8fe884a5b92310d6':
  avconv: support parsing bitstream filter options

This commit is a noop, see 5ef19590802f000299e418143fc2301e3f43affe

Merged-by: James Almer <jamrial at gmail.com>

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