Michael Niedermayer 53c2f401f7 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@gmx.at>

2013-01-14 14:00:21 +01:00

26 KiB

Raw Blame History

View Raw