mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 22:06:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

subtitleoverlay: fix merge error

Browse source 
Fix merge error from commit fb6d09055a
This commit is contained in:
Wim Taymans 2012-02-09 15:51:10 +01:00
parent f31d5d7505
commit 0dd59060d9
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/playback/gstsubtitleoverlay.c
View file

@ -240,10 +240,21 @@ _is_raw_video (GstStructure * s)
static gboolean static gboolean
_is_video_pad (GstPad * pad, gboolean * hw_accelerated) _is_video_pad (GstPad * pad, gboolean * hw_accelerated)
{ {
GstCaps *caps = gst_pad_get_current_caps (pad); GstPad *peer = gst_pad_get_peer (pad);
GstCaps *caps;
gboolean ret; gboolean ret;
const gchar *name; const gchar *name;
if (peer) {
caps = gst_pad_get_current_caps (peer);
if (!caps) {
caps = gst_pad_query_caps (peer, NULL);
}
gst_object_unref (peer);
} else {
caps = gst_pad_query_caps (pad, NULL);
}
name = gst_structure_get_name (gst_caps_get_structure (caps, 0)); name = gst_structure_get_name (gst_caps_get_structure (caps, 0));
if (g_str_has_prefix (name, "video/x-raw-")) { if (g_str_has_prefix (name, "video/x-raw-")) {
ret = TRUE; ret = TRUE;