[FFmpeg-cvslog] Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 29 01:06:58 2014 +0200| [c6eee3120a594cf25feb892f952a409a512d182e] | committer: Michael Niedermayer

Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure

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

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