Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:16:21 +0000 (01:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:16:21 +0000 (01:16 +0100)
commitb12eacb3837cad2daaeda1f77ceb1045bca68789
tree10428214a95fd2fce6c115ebf0dac9c709d35b4f
parent151ae8ea5b54e12da6d53fa96d67026371e760ea
parentd0a63d8b989647ffdb5f40da8e1feaffe1a8e791
Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'

* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
  qsvdec: split off some code that will be shared with the encoder

Conflicts:
libavcodec/Makefile
libavcodec/qsvdec.h

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