summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Ognibene <luogni@tin.it>2005-06-27 21:51:37 +0000
committerLuca Ognibene <luogni@tin.it>2005-06-27 21:51:37 +0000
commitbeb616773ddfe8c306586e957b9cfbcab307e0b4 (patch)
treecbdfd8ad01b5ecb0945a820f6f7476bdc8ba21c1
parent26d61e741bc664223203c89af42191ece9882c0f (diff)
downloadgst-libav-beb616773ddfe8c306586e957b9cfbcab307e0b4.tar.gz
ext/ffmpeg/gstffmpegdemux.c: timestamp is a GstClockTime, not a double..
Original commit message from CVS: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop): timestamp is a GstClockTime, not a double.. fix #309149 and maybe others bug
-rw-r--r--ChangeLog6
-rw-r--r--ext/ffmpeg/gstffmpegdemux.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cfa9ffe..479bdaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-27 Luca Ognibene <luogni@tin.it>
+
+ * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop):
+ timestamp is a GstClockTime, not a double..
+ fix #309149 and maybe others bug
+
2005-06-27 Daniel Fischer <dan@f3c.com>
reviewed by: Luca Ognibene <luogni@tin.it>
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 3b714c0..3677d59 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -656,7 +656,7 @@ gst_ffmpegdemux_loop (GstElement * element)
GST_BUFFER_SIZE (outbuf) = pkt.size;
if (pkt.pts != AV_NOPTS_VALUE) {
- GST_BUFFER_TIMESTAMP (outbuf) = (gdouble) (pkt.pts +
+ GST_BUFFER_TIMESTAMP (outbuf) = (GstClockTime) (pkt.pts +
stream->start_time) * GST_SECOND / AV_TIME_BASE;
demux->last_ts[stream->index] = GST_BUFFER_TIMESTAMP (outbuf);
}