Michael Niedermayer 5231eecdaf Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  Deprecate obsolete XvMC hardware decoding support

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo.c
	libavcodec/options_table.h
	libavutil/pixdesc.c
	libavutil/version.h

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

2013-11-14 03:26:35 +01:00

7.7 KiB

Raw Blame History

View Raw