Michael Niedermayer bf36dc50ea Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8' ...

* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
	libavcodec/allcodecs.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/vc1dec.c
	libavcodec/vdpau.c

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

2013-08-06 13:24:22 +02:00

26 KiB

Raw Blame History

View Raw