From: Wim Taymans Date: Mon, 18 Jan 2010 10:45:38 +0000 (+0100) Subject: avidemux: rename some variables X-Git-Tag: RELEASE-0.10.19~82 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6cc145352a55ad20d44dc452be84cdc94e1f18d;p=platform%2Fupstream%2Fgst-plugins-good.git avidemux: rename some variables seek_event -> seg_event event_seek -> seek_event --- diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 0af2874..f41c379 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -895,7 +895,6 @@ gst_avi_demux_handle_src_event (GstPad * pad, GstEvent * event) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_SEEK: - /* handle seeking only in pull mode */ if (!avi->streaming) { res = gst_avi_demux_handle_seek (avi, pad, event); } else { @@ -4239,9 +4238,9 @@ gst_avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, avi->state = GST_AVI_DEMUX_SEEK; /* copy the event */ - if (avi->event_seek) - gst_event_unref (avi->event_seek); - avi->event_seek = gst_event_ref (event); + if (avi->seek_event) + gst_event_unref (avi->seek_event); + avi->seek_event = gst_event_ref (event); if (!avi->building_index) { avi->building_index = 1; @@ -5097,11 +5096,11 @@ gst_avi_demux_chain (GstPad * pad, GstBuffer * buf) } /* calculate and perform seek */ - if (!avi_demux_handle_seek_push (avi, avi->sinkpad, avi->event_seek)) { + if (!avi_demux_handle_seek_push (avi, avi->sinkpad, avi->seek_event)) { GST_WARNING ("Push mode seek failed"); res = GST_FLOW_ERROR; } - gst_event_unref (avi->event_seek); + gst_event_unref (avi->seek_event); avi->state = GST_AVI_DEMUX_MOVI; break; default: diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h index 18768a9..c70ac28 100644 --- a/gst/avi/gstavidemux.h +++ b/gst/avi/gstavidemux.h @@ -193,7 +193,7 @@ typedef struct _GstAviDemux { guint64 first_movi_offset; guint64 idx1_offset; /* offset in file of list/chunk after movi */ - GstEvent *event_seek; + GstEvent *seek_event; gboolean building_index; guint odml_stream;