mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-18 07:47:17 +00:00
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.
This commit is contained in:
parent
825496342e
commit
577ded7b53
4 changed files with 14 additions and 3 deletions
11
ChangeLog
11
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):
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue