From 4eb4a1cdcc5a43b302d54d050bb059ccdbfb04d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 21 Nov 2006 12:33:25 +0000 Subject: [PATCH] ext/mpeg2dec/gstmpeg2dec.c: Cosmetic changes: fix misleading debug statement, update comment, add cast. Original commit message from CVS: * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_alloc_sized_buf): Cosmetic changes: fix misleading debug statement, update comment, add cast. --- ChangeLog | 6 ++++++ ext/mpeg2dec/gstmpeg2dec.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bad4a029ee..7fd1c74698 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-21 Tim-Philipp Müller + + * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_alloc_sized_buf): + Cosmetic changes: fix misleading debug statement, update + comment, add cast. + 2006-11-21 Wim Taymans Patch by: Sebastian Dröge diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index fa974b0895..6df23a7447 100644 --- a/ext/mpeg2dec/gstmpeg2dec.c +++ b/ext/mpeg2dec/gstmpeg2dec.c @@ -447,21 +447,22 @@ gst_mpeg2dec_alloc_sized_buf (GstMpeg2dec * mpeg2dec, guint size, * and if it fails only a single time create our own buffers from * there on below that are correctly aligned */ if (((uintptr_t) GST_BUFFER_DATA (*obuf)) % 16 == 0) { - GST_DEBUG_OBJECT (mpeg2dec, "return 16 byte aligned buffer"); + GST_LOG_OBJECT (mpeg2dec, "return 16 byte aligned buffer"); return ret; } GST_DEBUG_OBJECT (mpeg2dec, - "can get 16 byte aligned buffers, creating our own ones"); + "can't get 16 byte aligned buffers, creating our own ones"); gst_buffer_unref (*obuf); mpeg2dec->can_allocate_aligned = FALSE; } /* can't use gst_pad_alloc_buffer() here because the output buffer will - * be cropped and basetransform-based elements will complain about - * the wrong unit size when not operating in passthrough mode */ + * either be cropped later or be bigger than expected (for the alignment), + * and basetransform-based elements will complain about the wrong unit size + * when not operating in passthrough mode */ *obuf = gst_buffer_new_and_alloc (size + 15); - GST_BUFFER_DATA (*obuf) = ALIGN_16 (GST_BUFFER_DATA (*obuf)); + GST_BUFFER_DATA (*obuf) = (guint8 *) ALIGN_16 (GST_BUFFER_DATA (*obuf)); GST_BUFFER_SIZE (*obuf) = size; gst_buffer_set_caps (*obuf, GST_PAD_CAPS (mpeg2dec->srcpad));