Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:39:25 +0000 (17:39 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:42:12 +0000 (17:42 -0300)
commit678ab33861d1061d2b730ffccccab188c22faadd
tree69d0969da63ebddfee486e54521ab14a2c9e44de
parent99fa2fc5db06f842fdf91008fcc1e352cbe9e9dc
parentb6582b29277e00e5d49f400e58beefa5a21d83b8
Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'

* commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8':
  qsv: Add VC-1 decoder

See fb57bc6c34b979bec995e714162fdfb4caf6db1a.
Merged for cosmetic purposes to reduce differences with libav.

Merged-by: James Almer <jamrial@gmail.com>
configure
libavcodec/Makefile
libavcodec/qsvdec_other.c