[FFmpeg-cvslog] Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 23 14:43:08 2013 +0100| [3e641b4842b8b5f6592991479d19f1a7ce846308] | committer: Michael Niedermayer

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

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

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