[FFmpeg-cvslog] Merge commit '990e4a6639d0714198583c2812b1074b5751898f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  1 00:30:20 2015 +0100| [e73b3dba3e8084eb7141c2a8e27fba4950f2ba60] | committer: Michael Niedermayer

Merge commit '990e4a6639d0714198583c2812b1074b5751898f'

* commit '990e4a6639d0714198583c2812b1074b5751898f':
  Add a QSV decoding example.

Conflicts:
	configure
	doc/Makefile

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

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