From 6f74b2afb7252631afb6b48d98fea72ff475f25b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 8 Aug 2012 17:39:07 +0200
Subject: [PATCH] gst: Set alignment at the correct place of
 GstAllocationParams

---
 ext/jpeg/gstjpegenc.c         | 2 +-
 gst/matroska/matroska-demux.c | 2 +-
 gst/multipart/multipartmux.c  | 5 ++---
 gst/videomixer/videomixer2.c  | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index e9173ff..27331f1 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -179,7 +179,7 @@ ensure_memory (GstJpegEnc * jpegenc)
   GstMapInfo map;
   gsize old_size, desired_size, new_size;
   guint8 *new_data;
-  static GstAllocationParams params = { 0, 0, 0, 3, };
+  static GstAllocationParams params = { 0, 3, 0, 0, };
 
   old_size = jpegenc->output_map.size;
   if (old_size == 0)
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index b2b6304..3683817 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -3147,7 +3147,7 @@ gst_matroska_demux_align_buffer (GstMatroskaDemux * demux,
 
   if (((guintptr) map.data) & (alignment - 1)) {
     GstBuffer *new_buffer;
-    GstAllocationParams params = { 0, 0, 0, alignment - 1, };
+    GstAllocationParams params = { 0, alignment - 1, 0, 0, };
 
     new_buffer = gst_buffer_new_allocate (NULL,
         gst_buffer_get_size (buffer), &params);
diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c
index 38d3711..8c585c1 100644
--- a/gst/multipart/multipartmux.c
+++ b/gst/multipart/multipartmux.c
@@ -395,7 +395,6 @@ gst_multipart_mux_collected (GstCollectPads * pads, GstMultipartMux * mux)
   GstStructure *structure = NULL;
   GstCaps *caps;
   const gchar *mime;
-  static GstAllocationParams params = { 0, 0, 0, 1, };
 
   GST_DEBUG_OBJECT (mux, "all pads are collected");
 
@@ -462,7 +461,7 @@ gst_multipart_mux_collected (GstCollectPads * pads, GstMultipartMux * mux)
       mux->boundary, mime, gst_buffer_get_size (best->buffer));
   headerlen = strlen (header);
 
-  headerbuf = gst_buffer_new_allocate (NULL, headerlen, &params);
+  headerbuf = gst_buffer_new_allocate (NULL, headerlen, NULL);
   gst_buffer_fill (headerbuf, 0, header, headerlen);
   g_free (header);
 
@@ -502,7 +501,7 @@ gst_multipart_mux_collected (GstCollectPads * pads, GstMultipartMux * mux)
      * don't need to unref headerbuf here. */
     goto beach;
 
-  footerbuf = gst_buffer_new_allocate (NULL, 2, &params);
+  footerbuf = gst_buffer_new_allocate (NULL, 2, NULL);
   gst_buffer_fill (footerbuf, 0, "\r\n", 2);
 
   /* the footer has the same timestamp as the data buffer and has a
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c
index fba78e7..2903deb 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -818,7 +818,7 @@ gst_videomixer2_blend_buffers (GstVideoMixer2 * mix,
   guint outsize;
   BlendFunction composite;
   GstVideoFrame outframe;
-  static GstAllocationParams params = { 0, 0, 0, 15, };
+  static GstAllocationParams params = { 0, 15, 0, 0, };
 
   outsize = GST_VIDEO_INFO_SIZE (&mix->info);
 
-- 
2.7.4