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

ext/gnomevfs/gstgnomevfssrc.c: Don't send EOS event here, the base class will send one for us.

Browse source 
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:
Tim-Philipp Müller 2006-02-21 12:16:16 +00:00
parent 825496342e
commit 577ded7b53
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -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> 2006-02-21 Tim-Philipp Müller <tim at centricular dot net>
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_volume): * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_volume):

1
ext/gnomevfs/gstgnomevfssrc.c
View file

@ -1033,7 +1033,6 @@ eos:
{ {
gst_buffer_unref (buf); gst_buffer_unref (buf);
GST_DEBUG_OBJECT (src, "Reading data gave EOS"); GST_DEBUG_OBJECT (src, "Reading data gave EOS");
gst_pad_push_event (basesrc->srcpad, gst_event_new_eos ());
return GST_FLOW_UNEXPECTED; return GST_FLOW_UNEXPECTED;
} }
} }

3
gst/playback/gstplaybasebin.c
View file

@ -1423,7 +1423,8 @@ prepare_output (GstPlayBaseBin * play_base_bin)
break; break;
} else if (info->type == GST_STREAM_TYPE_AUDIO) { } else if (info->type == GST_STREAM_TYPE_AUDIO) {
stream_found = TRUE; 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; got_subtitle = TRUE;
} else if (!item->prev && !item->next) { } else if (!item->prev && !item->next) {
/* We're no audio/video and the only stream... We could /* We're no audio/video and the only stream... We could

2
gst/subparse/gstsubparse.c
View file

@ -879,7 +879,7 @@ gst_subparse_type_find (GstTypeFind * tf, gpointer private)
GST_DEBUG ("SubRip format detected"); GST_DEBUG ("SubRip format detected");
break; break;
case GST_SUB_PARSE_FORMAT_MPSUB: case GST_SUB_PARSE_FORMAT_MPSUB:
GST_DEBUG ("SubRip format detected"); GST_DEBUG ("MPSub format detected");
break; break;
case GST_SUB_PARSE_FORMAT_UNKNOWN: case GST_SUB_PARSE_FORMAT_UNKNOWN:
GST_DEBUG ("no subtitle format detected"); GST_DEBUG ("no subtitle format detected");