Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 12:59:09 +0000 (13:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 13:00:21 +0000 (14:00 +0100)
commit53c2f401f726732e56343377452e487c8c6a0ee1
treed472c200b5b6e28c0f14c22194e80fc1fc37e833
parent41bdef1d39584727c9deaa42b86d085138098231
parent246da0b13551b1f80f067e4f258e5bd691f5ab33
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>
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/vdpau_h264.c
libavcodec/vdpau_vc1.c
libavcodec/version.h
libavdevice/v4l2.c