Merge commit '8b7a9729aa162e2bbd571933f1aa40767f1ff47b'
authorClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:13:55 +0000 (13:13 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 12 Mar 2017 12:13:55 +0000 (13:13 +0100)
* commit '8b7a9729aa162e2bbd571933f1aa40767f1ff47b':
  avconv_qsv: use the actual pixel format provided by lavc

This commit is a noop, see 03cef34aa66

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge