diff options
author | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2016-01-22 19:27:13 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2016-01-25 12:09:40 +0000 |
commit | 1c722efe54b89a0c31840108ace71661aaca969f (patch) | |
tree | 64b33946b47d9e456d255fc3c942d998a4abeea4 /gst-libs/gst/vaapi | |
parent | 28caa2016710baf803b16877f247b50cf2cbebee (diff) | |
download | gst-vaapi-1c722efe54b89a0c31840108ace71661aaca969f.tar.gz |
Remove old gst version guards
As gstreamer-vaapi now only supports from GStreamer 1.6, this patch removes
all the old GStreamer version guards.
Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
Diffstat (limited to 'gst-libs/gst/vaapi')
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapidecoder.c | 2 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapidecoder_h264.c | 3 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapidecoder_priv.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapiencoder_h264.c | 2 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapiprofile.c | 12 |
5 files changed, 0 insertions, 21 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder.c b/gst-libs/gst/vaapi/gstvaapidecoder.c index 72367d9f..2c9ccbee 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder.c +++ b/gst-libs/gst/vaapi/gstvaapidecoder.c @@ -924,7 +924,6 @@ gst_vaapi_decoder_set_interlaced (GstVaapiDecoder * decoder, GST_VIDEO_INTERLACE_MODE_PROGRESSIVE)); } -#if GST_CHECK_VERSION(1,5,0) void gst_vaapi_decoder_set_multiview_mode (GstVaapiDecoder * decoder, gint views, GstVideoMultiviewMode mv_mode, GstVideoMultiviewFlags mv_flags) @@ -951,7 +950,6 @@ gst_vaapi_decoder_set_multiview_mode (GstVaapiDecoder * decoder, notify_codec_state_changed (decoder); } } -#endif gboolean gst_vaapi_decoder_ensure_context (GstVaapiDecoder * decoder, diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c index 55cb3962..bd8f32a1 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c +++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c @@ -1448,8 +1448,6 @@ ensure_context(GstVaapiDecoderH264 *decoder, GstH264SPS *sps) priv->profile = profile; } -#if GST_CHECK_VERSION(1,5,0) - /* Multiview flags only available in >= 1.5 */ if (reset_context) { switch (num_views) { case 1: @@ -1476,7 +1474,6 @@ ensure_context(GstVaapiDecoderH264 *decoder, GstH264SPS *sps) break; } } -#endif chroma_type = gst_vaapi_utils_h264_get_chroma_type(sps->chroma_format_idc); if (!chroma_type) { diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_priv.h b/gst-libs/gst/vaapi/gstvaapidecoder_priv.h index 3b7aa0e8..3473315f 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder_priv.h +++ b/gst-libs/gst/vaapi/gstvaapidecoder_priv.h @@ -263,12 +263,10 @@ void gst_vaapi_decoder_set_interlaced (GstVaapiDecoder * decoder, gboolean interlaced); -#if GST_CHECK_VERSION(1,5,0) G_GNUC_INTERNAL void gst_vaapi_decoder_set_multiview_mode (GstVaapiDecoder * decoder, gint views, GstVideoMultiviewMode mv_mode, GstVideoMultiviewFlags mv_flags); -#endif G_GNUC_INTERNAL gboolean diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c index c3a7c5fe..758af7f2 100644 --- a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c +++ b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c @@ -2793,12 +2793,10 @@ gst_vaapi_encoder_h264_reconfigure (GstVaapiEncoder * base_encoder) encoder->config_changed = TRUE; } -#if GST_CHECK_VERSION(1,5,0) /* Take number of MVC views from input caps if provided */ if (GST_VIDEO_INFO_MULTIVIEW_MODE (vip) == GST_VIDEO_MULTIVIEW_MODE_FRAME_BY_FRAME || GST_VIDEO_INFO_MULTIVIEW_MODE (vip) == GST_VIDEO_MULTIVIEW_MODE_MULTIVIEW_FRAME_BY_FRAME) encoder->num_views = GST_VIDEO_INFO_VIEWS (vip); -#endif encoder->is_mvc = encoder->num_views > 1; diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.c b/gst-libs/gst/vaapi/gstvaapiprofile.c index 2377b869..5ebbb8a6 100644 --- a/gst-libs/gst/vaapi/gstvaapiprofile.c +++ b/gst-libs/gst/vaapi/gstvaapiprofile.c @@ -122,7 +122,6 @@ static const GstVaapiProfileMap gst_vaapi_profiles[] = { "video/x-h264", "stereo-high" }, #endif -#if GST_CHECK_VERSION(1,5,0) { GST_VAAPI_PROFILE_VC1_SIMPLE, VAProfileVC1Simple, "video/x-wmv, wmvversion=3", "simple" }, @@ -132,17 +131,6 @@ static const GstVaapiProfileMap gst_vaapi_profiles[] = { { GST_VAAPI_PROFILE_VC1_ADVANCED, VAProfileVC1Advanced, "video/x-wmv, wmvversion=3, format=(string)WVC1", "advanced" }, -#else - { GST_VAAPI_PROFILE_VC1_SIMPLE, VAProfileVC1Simple, - "video/x-wmv, wmvversion=3", NULL - }, - { GST_VAAPI_PROFILE_VC1_MAIN, VAProfileVC1Main, - "video/x-wmv, wmvversion=3", NULL - }, - { GST_VAAPI_PROFILE_VC1_ADVANCED, VAProfileVC1Advanced, - "video/x-wmv, wmvversion=3, format=(string)WVC1", NULL - }, -#endif #if VA_CHECK_VERSION(0,32,0) { GST_VAAPI_PROFILE_JPEG_BASELINE, VAProfileJPEGBaseline, "image/jpeg", NULL |