aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/allcodecs.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-11-05 08:16:31 +0100
committerDiego Biurrun <diego@biurrun.de>2013-11-13 21:07:45 +0100
commit19e30a58fc8ee6187a0bc14aff7f566a13c81421 (patch)
treefaf20ff671c7a6e7f6984f30b058b22b59ca8c73 /libavcodec/allcodecs.c
parentc7f7bfc9e3a3150ba72bc34366c13fb2210c66ac (diff)
downloadffmpeg-19e30a58fc8ee6187a0bc14aff7f566a13c81421.tar.gz
Deprecate obsolete XvMC hardware decoding support
XvMC has long ago been superseded by newer acceleration APIs, such as VDPAU, and few downstreams still support it. Furthermore XvMC is not implemented within the hwaccel framework, but requires its own specific code in the MPEG-1/2 decoder, which is a maintenance burden.
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r--libavcodec/allcodecs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 6172466d45..faa94b1ecb 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -24,8 +24,9 @@
* Provide registration of all codecs, parsers and bitstream filters for libavcodec.
*/
-#include "avcodec.h"
#include "config.h"
+#include "avcodec.h"
+#include "version.h"
#define REGISTER_HWACCEL(X, x) \
{ \
@@ -178,7 +179,9 @@ void avcodec_register_all(void)
REGISTER_DECODER(MJPEGB, mjpegb);
REGISTER_DECODER(MMVIDEO, mmvideo);
REGISTER_DECODER(MOTIONPIXELS, motionpixels);
+#if FF_API_XVMC
REGISTER_DECODER(MPEG_XVMC, mpeg_xvmc);
+#endif /* FF_API_XVMC */
REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video);
REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video);
REGISTER_ENCDEC (MPEG4, mpeg4);