diff options
Diffstat (limited to 'gst')
-rw-r--r-- | gst/Makefile.in | 1 | ||||
-rw-r--r-- | gst/asfdemux/Makefile.in | 1 | ||||
-rw-r--r-- | gst/asfdemux/gstasfdemux.c | 57 | ||||
-rw-r--r-- | gst/asfdemux/gstrtspwms.c | 2 | ||||
-rw-r--r-- | gst/dvdlpcmdec/Makefile.in | 1 | ||||
-rw-r--r-- | gst/dvdsub/Makefile.in | 1 | ||||
-rw-r--r-- | gst/dvdsub/gstdvdsubdec.c | 1 | ||||
-rw-r--r-- | gst/realmedia/Makefile.in | 1 | ||||
-rw-r--r-- | gst/realmedia/rademux.c | 2 | ||||
-rw-r--r-- | gst/realmedia/rdtmanager.c | 2 | ||||
-rw-r--r-- | gst/realmedia/rtspreal.c | 2 | ||||
-rw-r--r-- | gst/xingmux/Makefile.in | 1 | ||||
-rw-r--r-- | gst/xingmux/gstxingmux.c | 2 | ||||
-rw-r--r-- | gst/xingmux/plugin.c | 2 |
14 files changed, 21 insertions, 55 deletions
diff --git a/gst/Makefile.in b/gst/Makefile.in index 0dbfc8c..6cd649a 100644 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -91,7 +91,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/asfdemux/Makefile.in b/gst/asfdemux/Makefile.in index 2bd02e7..b64afd9 100644 --- a/gst/asfdemux/Makefile.in +++ b/gst/asfdemux/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 72f4274..07a6a71 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -155,16 +155,16 @@ gst_asf_demux_free_stream (GstASFDemux * demux, AsfStream * stream) stream->pad = NULL; } - while (stream->payloads->len > 0) { - AsfPayload *payload; - guint last; - - last = stream->payloads->len - 1; - payload = &g_array_index (stream->payloads, AsfPayload, last); - gst_buffer_replace (&payload->buf, NULL); - g_array_remove_index (stream->payloads, last); - } if (stream->payloads) { + while (stream->payloads->len > 0) { + AsfPayload *payload; + guint last; + + last = stream->payloads->len - 1; + payload = &g_array_index (stream->payloads, AsfPayload, last); + gst_buffer_replace (&payload->buf, NULL); + g_array_remove_index (stream->payloads, last); + } g_array_free (stream->payloads, TRUE); stream->payloads = NULL; } @@ -2197,32 +2197,6 @@ gst_asf_demux_get_uint64 (guint8 ** p_data, guint64 * p_size) return ret; } -static inline guint32 -gst_asf_demux_get_var_length (guint8 type, guint8 ** p_data, guint64 * p_size) -{ - switch (type) { - case 0: - return 0; - - case 1: - g_assert (*p_size >= 1); - return gst_asf_demux_get_uint8 (p_data, p_size); - - case 2: - g_assert (*p_size >= 2); - return gst_asf_demux_get_uint16 (p_data, p_size); - - case 3: - g_assert (*p_size >= 4); - return gst_asf_demux_get_uint32 (p_data, p_size); - - default: - g_assert_not_reached (); - break; - } - return 0; -} - static gboolean gst_asf_demux_get_buffer (GstBuffer ** p_buf, guint num_bytes_to_read, guint8 ** p_data, guint64 * p_size) @@ -2487,6 +2461,7 @@ gst_asf_demux_add_video_stream (GstASFDemux * demux, guint8 ** p_data, guint64 * p_size) { GstTagList *tags = NULL; + GstStructure *caps_s; GstBuffer *extradata = NULL; GstPad *src_pad; GstCaps *caps; @@ -2544,10 +2519,14 @@ gst_asf_demux_add_video_stream (GstASFDemux * demux, gst_structure_remove_field (s, "framerate"); } - /* add fourcc format to caps, some proprietary decoders seem to need it */ - str = g_strdup_printf ("%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (video->tag)); - gst_caps_set_simple (caps, "format", G_TYPE_STRING, str, NULL); - g_free (str); + caps_s = gst_caps_get_structure (caps, 0); + + /* add format field with fourcc to WMV/VC1 caps to differentiate variants */ + if (gst_structure_has_name (caps_s, "video/x-wmv")) { + str = g_strdup_printf ("%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (video->tag)); + gst_caps_set_simple (caps, "format", G_TYPE_STRING, str, NULL); + g_free (str); + } if (codec_name) { tags = gst_tag_list_new (GST_TAG_VIDEO_CODEC, codec_name, NULL); diff --git a/gst/asfdemux/gstrtspwms.c b/gst/asfdemux/gstrtspwms.c index bdcffab..c864287 100644 --- a/gst/asfdemux/gstrtspwms.c +++ b/gst/asfdemux/gstrtspwms.c @@ -22,8 +22,6 @@ * SECTION:element-rtspwms * * A WMS RTSP extension - * - * Last reviewed on 2007-07-25 (0.10.14) */ #include <string.h> diff --git a/gst/dvdlpcmdec/Makefile.in b/gst/dvdlpcmdec/Makefile.in index 2b785a0..d20e1fd 100644 --- a/gst/dvdlpcmdec/Makefile.in +++ b/gst/dvdlpcmdec/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/dvdsub/Makefile.in b/gst/dvdsub/Makefile.in index 354f3db..9fd3f77 100644 --- a/gst/dvdsub/Makefile.in +++ b/gst/dvdsub/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c index 2cfff7f..2589ee6 100644 --- a/gst/dvdsub/gstdvdsubdec.c +++ b/gst/dvdsub/gstdvdsubdec.c @@ -367,6 +367,7 @@ gst_dvd_sub_dec_parse_subpic (GstDvdSubDec * dec) gst_guint64_to_gdouble (GST_SECOND)); return; } + break; } else { dec->parse_pos = NULL; dec->next_event_ts = GST_CLOCK_TIME_NONE; diff --git a/gst/realmedia/Makefile.in b/gst/realmedia/Makefile.in index 235013f..5909e4a 100644 --- a/gst/realmedia/Makefile.in +++ b/gst/realmedia/Makefile.in @@ -90,7 +90,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/realmedia/rademux.c b/gst/realmedia/rademux.c index dfa85eb..155192f 100644 --- a/gst/realmedia/rademux.c +++ b/gst/realmedia/rademux.c @@ -33,8 +33,6 @@ * ]| Stream RealAudio data containing AC3 (dnet) compressed audio and decode it * and output it to the soundcard using the ALSA element. * </refsect2> - * - * Last reviewed on 2006-10-24 (0.10.5) */ #ifdef HAVE_CONFIG_H diff --git a/gst/realmedia/rdtmanager.c b/gst/realmedia/rdtmanager.c index a2d1b70..39c74b2 100644 --- a/gst/realmedia/rdtmanager.c +++ b/gst/realmedia/rdtmanager.c @@ -47,8 +47,6 @@ * @see_also: GstRtspSrc * * A simple RTP session manager used internally by rtspsrc. - * - * Last reviewed on 2006-06-20 (0.10.4) */ /* #define HAVE_RTCP */ diff --git a/gst/realmedia/rtspreal.c b/gst/realmedia/rtspreal.c index c4363b8..3a7bbc7 100644 --- a/gst/realmedia/rtspreal.c +++ b/gst/realmedia/rtspreal.c @@ -22,8 +22,6 @@ * SECTION:element-rtspreal * * A RealMedia RTSP extension - * - * Last reviewed on 2007-07-25 (0.10.14) */ #ifdef HAVE_CONFIG_H diff --git a/gst/xingmux/Makefile.in b/gst/xingmux/Makefile.in index c8be046..52d03f6 100644 --- a/gst/xingmux/Makefile.in +++ b/gst/xingmux/Makefile.in @@ -88,7 +88,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ $(top_srcdir)/common/m4/as-compiler-flag.m4 \ $(top_srcdir)/common/m4/as-libtool.m4 \ - $(top_srcdir)/common/m4/as-scrub-include.m4 \ $(top_srcdir)/common/m4/as-version.m4 \ $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/common/m4/gst-arch.m4 \ diff --git a/gst/xingmux/gstxingmux.c b/gst/xingmux/gstxingmux.c index dacd1ec..fd09ac0 100644 --- a/gst/xingmux/gstxingmux.c +++ b/gst/xingmux/gstxingmux.c @@ -418,7 +418,7 @@ gst_xing_mux_class_init (GstXingMuxClass * klass) GST_DEBUG_CATEGORY_INIT (xing_mux_debug, "xingmux", 0, "Xing Header Muxer"); gst_element_class_set_static_metadata (gstelement_class, "MP3 Xing muxer", - "Formatter/Metadata", + "Formatter/Muxer/Metadata", "Adds a Xing header to the beginning of a VBR MP3 file", "Christophe Fergeau <teuf@gnome.org>"); } diff --git a/gst/xingmux/plugin.c b/gst/xingmux/plugin.c index 7cfaf58..470a24e 100644 --- a/gst/xingmux/plugin.c +++ b/gst/xingmux/plugin.c @@ -27,7 +27,7 @@ static gboolean plugin_init (GstPlugin * plugin) { - if (!gst_element_register (plugin, "xingmux", GST_RANK_NONE, + if (!gst_element_register (plugin, "xingmux", GST_RANK_MARGINAL, GST_TYPE_XING_MUX)) return FALSE; |