diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2020-07-28 20:00:09 +0200 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2020-07-29 09:10:22 +0200 |
| commit | ecd1ca81a7098bcb16a71e9c2f574ac29b8e9166 (patch) | |
| tree | 0b5d0a567b4761c0fd8360c2efeb5dcc789960a3 /gst | |
| parent | 525abc6d1e3e655f74a9dc1c295053a480ad71cc (diff) | |
| download | gstreamer-vaapi-ecd1ca81a7098bcb16a71e9c2f574ac29b8e9166.tar.gz | |
vaapidecode: always merge profile caps in sink caps
This commit fixes a regression of e962069d, where if the profile's
caps doesn't have a caps profile, it's ignored.
This patch add a conditional jump if the caps doesn't have a profile
field to merge it.
Fixes: #271
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/368>
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/vaapi/gstvaapidecode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c index 4d9add3e..59ec6e95 100644 --- a/gst/vaapi/gstvaapidecode.c +++ b/gst/vaapi/gstvaapidecode.c @@ -1289,7 +1289,7 @@ gst_vaapidecode_ensure_allowed_sinkpad_caps (GstVaapiDecode * decode) profile_name = gst_vaapi_profile_get_name (profile); if (!profile_name) - continue; + goto merge_caps; /* Add all according -intra profile for HEVC */ if (profile == GST_VAAPI_PROFILE_H265_MAIN @@ -1346,8 +1346,8 @@ gst_vaapidecode_ensure_allowed_sinkpad_caps (GstVaapiDecode * decode) profile_name, NULL); } + merge_caps: gst_vaapi_profile_caps_append_decoder (display, profile, structure); - allowed_sinkpad_caps = gst_caps_merge (allowed_sinkpad_caps, caps); } |