From: Benjamin O. <co...@pd...> - 2004-06-06 21:03:22
|
CVS Root: /home/cvs/gstreamer Module: gst-plugins Changes by: company Date: Mon Jun 07 2004 07:03:19 EST Log message: * ext/mad/gstid3tag.c: (gst_id3_tag_handle_event): forward correctly transformed offset in discont events. Based on patch by Arwed v. Merkatz. (fixes #142851) Modified files: . : ChangeLog ext/mad : gstid3tag.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.736&r2=1.737 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/mad/gstid3tag.c.diff?r1=1.41&r2=1.42 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.736 retrieving revision 1.737 diff -u -d -r1.736 -r1.737 --- a/ChangeLog 6 Jun 2004 20:58:59 -0000 1.736 +++ b/ChangeLog 6 Jun 2004 21:03:06 -0000 1.737 @@ -1,3 +1,9 @@ +2004-06-06 Benjamin Otte <ot...@gn...> + + * ext/mad/gstid3tag.c: (gst_id3_tag_handle_event): + forward correctly transformed offset in discont events. Based on + patch by Arwed v. Merkatz. (fixes #142851) 2004-06-06 David Schleef <ds...@sc...> * gst/ffmpegcolorspace/gstffmpegcodecmap.c: that's Index: gstid3tag.c RCS file: /home/cvs/gstreamer/gst-plugins/ext/mad/gstid3tag.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- a/gstid3tag.c 24 May 2004 14:12:33 -0000 1.41 +++ b/gstid3tag.c 6 Jun 2004 21:03:07 -0000 1.42 @@ -798,7 +798,12 @@ GstEvent *new; if (gst_event_discont_get_value (event, GST_FORMAT_BYTES, &value)) { - value += tag->v1tag_size; + if (value > tag->v2tag_size) { + value -= tag->v2tag_size; + } else { + /* FIXME: throw an error here? */ + value = 0; + } new = gst_event_new_discontinuous (FALSE, GST_FORMAT_BYTES, value, 0); gst_data_unref (GST_DATA (event)); |