Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:03:23 +0000 (01:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:03:23 +0000 (01:03 +0100)
commit151ae8ea5b54e12da6d53fa96d67026371e760ea
tree892d2bff27e97e165819d75ebe0d6bb0872a295c
parent4ae7c3709958da7e0bd17cfebf1c947a84594c53
parentb04d009b0e1a34b717f3d3bbf407aef0c742aff1
Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'

* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
  qsv: rename to qsvdec

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/qsvdec.c
libavcodec/qsvdec.h
libavcodec/qsvdec_h264.c