vaapidecode: merge vc1 and wmv3 elements

This patch merges vaapivc1dec and vaapiwmv3dec into a single
vaapivc1dec. Also, removed the WMVA format, since it is not
supported by libva.

https://bugzilla.gnome.org/show_bug.cgi?id=734093
This commit is contained in:
Víctor Manuel Jáquez Leal 2016-09-06 12:27:45 +02:00
parent 7ebef58093
commit 5ed967088f

View file

@ -161,10 +161,8 @@ static const GstVaapiDecoderMap vaapi_decode_map[] = {
"video/mpeg, mpegversion=4"}, "video/mpeg, mpegversion=4"},
{GST_VAAPI_CODEC_H263, GST_RANK_PRIMARY, "h263", "video/x-h263"}, {GST_VAAPI_CODEC_H263, GST_RANK_PRIMARY, "h263", "video/x-h263"},
{GST_VAAPI_CODEC_H264, GST_RANK_PRIMARY, "h264", "video/x-h264"}, {GST_VAAPI_CODEC_H264, GST_RANK_PRIMARY, "h264", "video/x-h264"},
{GST_VAAPI_CODEC_WMV3, GST_RANK_PRIMARY, "wmv3",
"video/x-wmv, wmvversion=3, format=WMV3"},
{GST_VAAPI_CODEC_VC1, GST_RANK_PRIMARY, "vc1", {GST_VAAPI_CODEC_VC1, GST_RANK_PRIMARY, "vc1",
"video/x-wmv, wmvversion=3, format={WVC1,WMVA}"}, "video/x-wmv, wmvversion=3, format={WMV3,WVC1}"},
#if USE_VP8_DECODER #if USE_VP8_DECODER
{GST_VAAPI_CODEC_VP8, GST_RANK_PRIMARY, "vp8", "video/x-vp8"}, {GST_VAAPI_CODEC_VP8, GST_RANK_PRIMARY, "vp8", "video/x-vp8"},
#endif #endif