From: <wt...@fr...> - 2004-08-22 09:31:22
|
CVS Root: /cvs/gstreamer Module: gst-plugins Changes by: wtay Date: Sun Aug 22 2004 02:31:19 PDT Log message: * ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer), (gst_ogg_mux_send_headers), (gst_ogg_mux_loop): Make sure we never send -1 granulepos. Modified files: . : ChangeLog ext/ogg : gstoggmux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1017&r2=1.1018 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/ogg/gstoggmux.c.diff?r1=1.14&r2=1.15 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1017 retrieving revision 1.1018 diff -u -d -r1.1017 -r1.1018 --- ChangeLog 20 Aug 2004 10:46:51 -0000 1.1017 +++ ChangeLog 22 Aug 2004 09:31:06 -0000 1.1018 @@ -1,3 +1,9 @@ +2004-08-22 Wim Taymans <wi...@fl...> + + * ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer), + (gst_ogg_mux_send_headers), (gst_ogg_mux_loop): + Make sure we never send -1 granulepos. 2004-08-20 Wim Taymans <wi...@fl...> * ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer), Index: gstoggmux.c RCS file: /cvs/gstreamer/gst-plugins/ext/ogg/gstoggmux.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- gstoggmux.c 20 Aug 2004 10:46:51 -0000 1.14 +++ gstoggmux.c 22 Aug 2004 09:31:06 -0000 1.15 @@ -714,6 +714,8 @@ packet.packet = GST_BUFFER_DATA (buf); packet.bytes = GST_BUFFER_SIZE (buf); packet.granulepos = GST_BUFFER_OFFSET_END (buf); + if (packet.granulepos == -1) + packet.granulepos = 0; /* mark BOS and packet number */ packet.b_o_s = (pad->packetno == 0); packet.packetno = pad->packetno++; @@ -755,6 +757,8 @@ packet.packet = GST_BUFFER_DATA (buf); packet.bytes = GST_BUFFER_SIZE (buf); packet.granulepos = GST_BUFFER_OFFSET_END (buf); + if (packet.granulepos == -1) + packet.granulepos = 0; /* mark BOS and packet number */ packet.b_o_s = (pad->packetno == 0); packet.packetno = pad->packetno++; @@ -910,6 +914,8 @@ |