From: <sl...@ke...> - 2008-09-28 17:34:07
|
CVS Root: /cvs/gstreamer Module: gst-plugins-ugly Changes by: slomo Date: Sun Sep 28 2008 17:33:58 UTC Log message: Patch by: Sameer Naik <sameer dot subscriptions at damagehead dot com> * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_class_init), (handle_slice), (gst_mpeg2dec_sink_event), (gst_mpeg2dec_src_event): * ext/mpeg2dec/gstmpeg2dec.h: Fix compilation with --disable-index. Fixes bug #554150. Modified files: . : ChangeLog ext/mpeg2dec : gstmpeg2dec.c gstmpeg2dec.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ChangeLog.diff?r1=1.2416&r2=1.2417 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ext/mpeg2dec/gstmpeg2dec.c.diff?r1=1.127&r2=1.128 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ext/mpeg2dec/gstmpeg2dec.h.diff?r1=1.34&r2=1.35 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-ugly/ChangeLog,v retrieving revision 1.2416 retrieving revision 1.2417 diff -u -d -r1.2416 -r1.2417 --- ChangeLog 28 Sep 2008 17:31:35 -0000 1.2416 +++ ChangeLog 28 Sep 2008 17:33:42 -0000 1.2417 @@ -2,6 +2,16 @@ Patch by: Sameer Naik <sameer dot subscriptions at damagehead dot com> + * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_class_init), + (handle_slice), (gst_mpeg2dec_sink_event), + (gst_mpeg2dec_src_event): + * ext/mpeg2dec/gstmpeg2dec.h: + Fix compilation with --disable-index. Fixes bug #554150. + +2008-09-28 Sebastian Dröge <seb...@co...> + Patch by: Sameer Naik <sameer dot subscriptions at damagehead dot com> * ext/mad/gstmad.c: (gst_mad_class_init), (gst_mad_dispose), (gst_mad_src_event), (gst_mad_chain): * ext/mad/gstmad.h: Index: gstmpeg2dec.c RCS file: /cvs/gstreamer/gst-plugins-ugly/ext/mpeg2dec/gstmpeg2dec.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- gstmpeg2dec.c 13 Jul 2008 10:13:06 -0000 1.127 +++ gstmpeg2dec.c 28 Sep 2008 17:33:43 -0000 1.128 @@ -95,8 +95,11 @@ const GValue * value, GParamSpec * pspec); static void gst_mpeg2dec_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); +#ifndef GST_DISABLE_INDEX static void gst_mpeg2dec_set_index (GstElement * element, GstIndex * index); static GstIndex *gst_mpeg2dec_get_index (GstElement * element); +#endif static gboolean gst_mpeg2dec_src_event (GstPad * pad, GstEvent * event); static const GstQueryType *gst_mpeg2dec_get_src_query_types (GstPad * pad); @@ -193,8 +196,10 @@ gobject_class->finalize = gst_mpeg2dec_finalize; gstelement_class->change_state = gst_mpeg2dec_change_state; gstelement_class->set_index = gst_mpeg2dec_set_index; gstelement_class->get_index = gst_mpeg2dec_get_index; } static void @@ -281,6 +286,7 @@ GST_OBJECT_UNLOCK (mpeg2dec); gst_mpeg2dec_set_index (GstElement * element, GstIndex * index) { @@ -298,6 +304,7 @@ return mpeg2dec->index; /* see gst-plugins/gst/games/gstvideoimage.c, paint_setup_I420() */ #define I420_Y_ROWSTRIDE(width) (GST_ROUND_UP_4(width)) @@ -917,12 +924,14 @@ picture->nb_fields, GST_BUFFER_OFFSET (outbuf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf))); if (mpeg2dec->index) { gst_index_add_association (mpeg2dec->index, mpeg2dec->index_id, (key_frame ? GST_ASSOCIATION_FLAG_KEY_UNIT : 0), GST_FORMAT_BYTES, GST_BUFFER_OFFSET (outbuf), GST_FORMAT_TIME, GST_BUFFER_TIMESTAMP (outbuf), 0); } if (picture->flags & PIC_FLAG_SKIP) goto skip; @@ -1261,9 +1270,11 @@ break; } case GST_EVENT_EOS: if (mpeg2dec->index && mpeg2dec->closed) { gst_index_commit (mpeg2dec->index, mpeg2dec->index_id); } ret = gst_pad_push_event (mpeg2dec->srcpad, event); default: @@ -1526,6 +1537,7 @@ #endif static gboolean index_seek (GstPad * pad, GstEvent * event) @@ -1592,7 +1604,7 @@ return FALSE; - normal_seek (GstPad * pad, GstEvent * event) @@ -1678,9 +1690,11 @@ case GST_EVENT_SEEK:{ gst_event_ref (event); if (!(res = gst_pad_push_event (mpeg2dec->sinkpad, event))) { if (mpeg2dec->index) res = index_seek (pad, event); else res = normal_seek (pad, event); gst_event_unref (event); Index: gstmpeg2dec.h RCS file: /cvs/gstreamer/gst-plugins-ugly/ext/mpeg2dec/gstmpeg2dec.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- gstmpeg2dec.h 10 Jan 2008 15:24:08 -0000 1.34 +++ gstmpeg2dec.h 28 Sep 2008 17:33:43 -0000 1.35 @@ -107,8 +107,10 @@ gint fps_d; gboolean need_sequence; GstIndex *index; gint index_id; gint error_count; gboolean can_allocate_aligned; |