[FFmpeg-cvslog] Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 13:59:09 2013 +0100| [53c2f401f726732e56343377452e487c8c6a0ee1] | committer: Michael Niedermayer

Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'

* commit '246da0b13551b1f80f067e4f258e5bd691f5ab33':
  v4l2: avoid pointless indirection.
  vdpau: Add VC-1 decoding via hwaccel infrastructure
  vdpau: Add H.264 decoding via hwaccel infrastructure

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/version.h
	libavdevice/v4l2.c

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

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