From c63db0e10490ff521a00fbe86414c3c8fb8b45b0 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Sat, 15 Aug 2015 08:14:00 -0300 Subject: [PATCH] Revert "videodecoder: expose default query handling function" Apparently I forgot how gobject works, there is no need to expose it directly as one can call it from the parent_class pointer This reverts commit ea9b6a7e3c4eea512650adf530b7f1acb0eccd84. --- gst-libs/gst/video/gstvideodecoder.c | 16 +++------------- gst-libs/gst/video/gstvideodecoder.h | 4 ---- win32/common/libgstvideo.def | 1 - 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c index 99dd4ee0f0..316e1d3989 100644 --- a/gst-libs/gst/video/gstvideodecoder.c +++ b/gst-libs/gst/video/gstvideodecoder.c @@ -479,6 +479,8 @@ static GstFlowReturn gst_video_decoder_parse_available (GstVideoDecoder * dec, gboolean at_eos, gboolean new_buffer); static gboolean gst_video_decoder_negotiate_unlocked (GstVideoDecoder * decoder); +static gboolean gst_video_decoder_sink_query_default (GstVideoDecoder * decoder, + GstQuery * query); static gboolean gst_video_decoder_src_query_default (GstVideoDecoder * decoder, GstQuery * query); @@ -1806,19 +1808,7 @@ gst_video_decoder_sink_getcaps (GstVideoDecoder * decoder, GstCaps * filter) return caps; } -/** - * gst_video_decoder_sink_query_default: - * @decoder: a #GstVideoDecoder - * @query: (transfer none): a #GstQuery - * - * Calls the default query handler for #GstVideoDecoder. It is useful - * when a subclass only want to handle a particular type of query and - * wants to use the default handler for others. - * - * Returns: a boolean, representing if the query was handled. - * Since: 1.6 - */ -gboolean +static gboolean gst_video_decoder_sink_query_default (GstVideoDecoder * decoder, GstQuery * query) { diff --git a/gst-libs/gst/video/gstvideodecoder.h b/gst-libs/gst/video/gstvideodecoder.h index 9497255b13..7622477067 100644 --- a/gst-libs/gst/video/gstvideodecoder.h +++ b/gst-libs/gst/video/gstvideodecoder.h @@ -424,13 +424,9 @@ GstCaps * gst_video_decoder_proxy_getcaps (GstVideoDecoder * decoder, GstCaps * caps, GstCaps * filter); -gboolean gst_video_decoder_sink_query_default (GstVideoDecoder * decoder, - GstQuery * query); - void gst_video_decoder_set_use_default_pad_acceptcaps (GstVideoDecoder * decoder, gboolean use); - G_END_DECLS #endif diff --git a/win32/common/libgstvideo.def b/win32/common/libgstvideo.def index 65ee984581..39b031f3ae 100644 --- a/win32/common/libgstvideo.def +++ b/win32/common/libgstvideo.def @@ -130,7 +130,6 @@ EXPORTS gst_video_decoder_set_output_state gst_video_decoder_set_packetized gst_video_decoder_set_use_default_pad_acceptcaps - gst_video_decoder_sink_query_default gst_video_dither_flags_get_type gst_video_dither_free gst_video_dither_line