Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 02:13:39 +0000 (03:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 02:26:35 +0000 (03:26 +0100)
commit5231eecdafff38d0b604c028be08f8fb78d55e53
tree325e3398888cbae2afcef0f3c91dc8a347f53168
parente25ed2608c960302d6f4832a5435c9672d78e282
parent19e30a58fc8ee6187a0bc14aff7f566a13c81421
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>
18 files changed:
doc/general.texi
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/error_resilience.c
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_xvmc.c
libavcodec/options_table.h
libavcodec/version.h
libavcodec/x86/dsputil_init.c
libavcodec/xvmc.h
libavcodec/xvmc_internal.h
libavutil/old_pix_fmts.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h