diff options
| author | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2016-09-06 12:27:45 +0200 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2016-09-06 12:39:22 +0200 |
| commit | 5ed967088f5f3256f4a0121c3b042ed05b967b55 (patch) | |
| tree | 71f4b818916bb58ba1fdcce218cedf02b17b0850 | |
| parent | 7ebef5809328534c74b9fbaabcd2363174545410 (diff) | |
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
| -rw-r--r-- | gst/vaapi/gstvaapidecode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c index ef3babbe..ed24c95e 100644 --- a/gst/vaapi/gstvaapidecode.c +++ b/gst/vaapi/gstvaapidecode.c @@ -161,10 +161,8 @@ static const GstVaapiDecoderMap vaapi_decode_map[] = { "video/mpeg, mpegversion=4"}, {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_WMV3, GST_RANK_PRIMARY, "wmv3", - "video/x-wmv, wmvversion=3, format=WMV3"}, {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 {GST_VAAPI_CODEC_VP8, GST_RANK_PRIMARY, "vp8", "video/x-vp8"}, #endif |