[FFmpeg-cvslog] Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 28 01:16:21 2015 +0100| [b12eacb3837cad2daaeda1f77ceb1045bca68789] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b12eacb3837cad2daaeda1f77ceb1045bca68789
---