[FFmpeg-cvslog] Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 28 01:03:23 2015 +0100| [151ae8ea5b54e12da6d53fa96d67026371e760ea] | committer: Michael Niedermayer

Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'

* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
  qsv: rename to qsvdec

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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