Merge commit '064f19f39e2f17927278c6ad8fe884a5b92310d6'
authorJames Almer <jamrial@gmail.com>
Mon, 27 Mar 2017 21:50:27 +0000 (18:50 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 27 Mar 2017 21:50:27 +0000 (18:50 -0300)
commit47c2ce2f75cd789fb7dc658c51bb4118a14628e2
treed2528a0f518a86bfff1a297e2f4c0d3564a9385f
parentcef2ba3603af7e45cab2f646e7946c55e93f669b
parent064f19f39e2f17927278c6ad8fe884a5b92310d6
Merge commit '064f19f39e2f17927278c6ad8fe884a5b92310d6'

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

This commit is a noop, see 5ef19590802f000299e418143fc2301e3f43affe

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