diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-08-12 10:57:18 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-08-12 10:57:18 +0200 |
| commit | 6923de9378392b58cb600676d22cae80b54c68f3 (patch) | |
| tree | 861e307c510f31f5aec0b2dc47f2f7069c2b6cd8 | |
| parent | 305e80e7d6d6e1e25f4ec4aa4c1f51b195ab7a74 (diff) | |
ffmpegdec: Don't use guintptr as it's new in GLib 2.18
Fixes bug #591469.
| -rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 30c761b..2c8f8e4 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -1659,10 +1659,10 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec, out_timestamp = gst_ts_handler_get_ts (ffmpegdec, &out_offset); /* Never do this at home... * 1) We know that ffmpegdec->context->reordered_opaque is 64-bit, and thus - * is capable of holding virtually anything (unless we're on 128-bit platform...) - * 2) guintptr is either 32-bit or 64-pit and always matches gpointer in size + * is capable of holding virtually anything including pointers + * (unless we're on 128-bit platform...) */ - *((guintptr *) & ffmpegdec->context->reordered_opaque) = + ffmpegdec->context->reordered_opaque = (gint64) GPOINTER_TO_SIZE (opaque_store (ffmpegdec, out_timestamp, out_offset)); /* now decode the frame */ @@ -1689,10 +1689,10 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec, /* recuperate the reordered timestamp */ if (!opaque_find (ffmpegdec, - GSIZE_TO_POINTER (*((guintptr *) & ffmpegdec-> + GSIZE_TO_POINTER (*((gsize *) & ffmpegdec-> picture->reordered_opaque)), &out_pts, &out_offset)) { GST_DEBUG_OBJECT (ffmpegdec, "Failed to find opaque %p", - *((guintptr *) & ffmpegdec->picture->reordered_opaque)); + *((gsize *) & ffmpegdec->picture->reordered_opaque)); out_pts = -1; out_offset = GST_BUFFER_OFFSET_NONE; } else { |