From 577ded7b53fa4e5c09aa1dcdc415c0d968cf7119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Tue, 21 Feb 2006 12:16:16 +0000
Subject: [PATCH] ext/gnomevfs/gstgnomevfssrc.c: Don't send EOS event here, the
 base class will send one for us.

Original commit message from CVS:
* ext/gnomevfs/gstgnomevfssrc.c: (gst_gnome_vfs_src_create):
Don't send EOS event here, the base class will send one for us.
* gst/playback/gstplaybasebin.c: (prepare_output):
Subpictures without video stream aren't allowed either.
* gst/subparse/gstsubparse.c: (gst_subparse_type_find):
Fix debug statement copy'n'paste-o.
---
 ChangeLog                     | 11 +++++++++++
 ext/gnomevfs/gstgnomevfssrc.c |  1 -
 gst/playback/gstplaybasebin.c |  3 ++-
 gst/subparse/gstsubparse.c    |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 10103186d7..17826374d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-21  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/gnomevfs/gstgnomevfssrc.c: (gst_gnome_vfs_src_create):
+	  Don't send EOS event here, the base class will send one for us.
+  
+	* gst/playback/gstplaybasebin.c: (prepare_output):
+	  Subpictures without video stream aren't allowed either.
+	
+	* gst/subparse/gstsubparse.c: (gst_subparse_type_find):
+	  Fix debug statement copy'n'paste-o.
+
 2006-02-21  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_volume):
diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c
index 0996cf6868..8ed2ff0e7d 100644
--- a/ext/gnomevfs/gstgnomevfssrc.c
+++ b/ext/gnomevfs/gstgnomevfssrc.c
@@ -1033,7 +1033,6 @@ eos:
   {
     gst_buffer_unref (buf);
     GST_DEBUG_OBJECT (src, "Reading data gave EOS");
-    gst_pad_push_event (basesrc->srcpad, gst_event_new_eos ());
     return GST_FLOW_UNEXPECTED;
   }
 }
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 67a3cde337..786fc1dd8d 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1423,7 +1423,8 @@ prepare_output (GstPlayBaseBin * play_base_bin)
       break;
     } else if (info->type == GST_STREAM_TYPE_AUDIO) {
       stream_found = TRUE;
-    } else if (info->type == GST_STREAM_TYPE_TEXT) {
+    } else if (info->type == GST_STREAM_TYPE_TEXT ||
+        info->type == GST_STREAM_TYPE_SUBPICTURE) {
       got_subtitle = TRUE;
     } else if (!item->prev && !item->next) {
       /* We're no audio/video and the only stream... We could
diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
index 67c191bde0..0a324bea5b 100644
--- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c
@@ -879,7 +879,7 @@ gst_subparse_type_find (GstTypeFind * tf, gpointer private)
       GST_DEBUG ("SubRip format detected");
       break;
     case GST_SUB_PARSE_FORMAT_MPSUB:
-      GST_DEBUG ("SubRip format detected");
+      GST_DEBUG ("MPSub format detected");
       break;
     case GST_SUB_PARSE_FORMAT_UNKNOWN:
       GST_DEBUG ("no subtitle format detected");