diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-11-05 11:16:31 +0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-11-14 00:07:45 +0400 |
| commit | 19e30a58fc8ee6187a0bc14aff7f566a13c81421 (patch) | |
| tree | faf20ff671c7a6e7f6984f30b058b22b59ca8c73 /libavcodec/codec_desc.c | |
| parent | c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac (diff) | |
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/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 73e8f6ddd6..68c895dd44 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -18,10 +18,10 @@ #include <string.h> -#include "avcodec.h" - #include "libavutil/common.h" #include "libavutil/internal.h" +#include "avcodec.h" +#include "version.h" static const AVCodecDescriptor codec_descriptors[] = { /* video codecs */ @@ -39,6 +39,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), .props = AV_CODEC_PROP_LOSSY, }, +#if FF_API_XVMC { .id = AV_CODEC_ID_MPEG2VIDEO_XVMC, .type = AVMEDIA_TYPE_VIDEO, @@ -46,6 +47,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"), .props = AV_CODEC_PROP_LOSSY, }, +#endif /* FF_API_XVMC */ { .id = AV_CODEC_ID_H261, .type = AVMEDIA_TYPE_VIDEO, |