Updating branch refs/heads/master
to 4748c060dbcfdf8cf7951a0ba7b6e475eaa8d7c0 (commit)
from c36fce4fed1e6831c9fc317d54722f5a05a4110f (commit)
commit 4748c060dbcfdf8cf7951a0ba7b6e475eaa8d7c0
Author: Sean Davis <[email protected]>
Date: Fri Jul 20 07:50:18 2012 -0400
Fixed g_object_unref error with videos.
src/gst/parole-gst.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 162cd39..24f7d79 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -812,8 +812,7 @@ parole_gst_query_info (ParoleGst *gst)
"n-audio", &n_audio,
"n-video", &n_video,
NULL);
-
-
+
g_object_set (G_OBJECT (gst->priv->stream),
"has-video", (n_video > 0),
"has-audio", (n_audio > 0),
@@ -823,7 +822,7 @@ parole_gst_query_info (ParoleGst *gst)
{
for (i = 0; i < n_video && videopad == NULL; i++)
g_signal_emit_by_name (gst->priv->playbin, "get-video-pad", i,
&videopad);
-
+
if (videopad)
{
GstCaps *caps;
@@ -831,7 +830,7 @@ parole_gst_query_info (ParoleGst *gst)
if ((caps = gst_pad_get_negotiated_caps (videopad)))
{
parole_gst_get_pad_capabilities (G_OBJECT (videopad), NULL,
gst);
- g_object_unref (caps);
+ gst_caps_unref (caps);
}
g_signal_connect (videopad, "notify::caps",
@@ -928,6 +927,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old,
GstState new, GstState
{
case GST_STATE_PLAYING:
{
+
gst->priv->media_state = PAROLE_STATE_PLAYING;
TRACE ("Playing");
parole_gst_query_capabilities (gst);
@@ -2244,6 +2244,8 @@ gst_get_lang_list_for_type (ParoleGst * gst, const gchar
* type_name)
gst_tag_list_get_string (tags, GST_TAG_LANGUAGE_CODE, &lc);
gst_tag_list_get_string (tags, GST_TAG_CODEC, &lc);
+
+ g_print("%s\n", lc);
if (lc) {
ret = g_list_prepend (ret, lc);
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
