diff options
author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-08-25 16:07:34 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2017-10-19 15:25:05 +0200 |
commit | 520ec3c9a3682aa9068ea60f8f53c010b4c5e7b9 (patch) | |
tree | 5da760109de6e7d707d5c7ccb040a27d09177511 | |
parent | 4c77aba7ceeb39748bc08a3a98cd0b8a53c4c297 (diff) |
libs: guard deprecated symbols
In VA-API 1.0 the H.264 baseline profile is deprecated. This patch
guards the H.264 baseline usage. Consider this commit as a
continuation of commit e0e0a474
https://bugzilla.gnome.org/show_bug.cgi?id=784398
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapiprofile.c | 2 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapiutils.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.c b/gst-libs/gst/vaapi/gstvaapiprofile.c index 9c353c56..6e8fd0a6 100644 --- a/gst-libs/gst/vaapi/gstvaapiprofile.c +++ b/gst-libs/gst/vaapi/gstvaapiprofile.c @@ -94,8 +94,10 @@ static const GstVaapiProfileMap gst_vaapi_profiles[] = { {GST_VAAPI_PROFILE_H263_BASELINE, VAProfileH263Baseline, "video/x-h263, variant=itu, h263version=h263", "baseline"}, #endif +#if !VA_CHECK_VERSION(1,0,0) {GST_VAAPI_PROFILE_H264_BASELINE, VAProfileH264Baseline, "video/x-h264", "baseline"}, +#endif #if VA_CHECK_VERSION(0,31,1) {GST_VAAPI_PROFILE_H264_CONSTRAINED_BASELINE, VAProfileH264ConstrainedBaseline, diff --git a/gst-libs/gst/vaapi/gstvaapiutils.c b/gst-libs/gst/vaapi/gstvaapiutils.c index c24bed7b..0f1c2cfa 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils.c +++ b/gst-libs/gst/vaapi/gstvaapiutils.c @@ -206,7 +206,9 @@ string_of_VAProfile (VAProfile profile) MAP (H263Baseline); MAP (H264ConstrainedBaseline); #endif +#if !VA_CHECK_VERSION(1,0,0) MAP (H264Baseline); +#endif MAP (H264Main); MAP (H264High); #if VA_CHECK_VERSION(0,35,2) |