From fcf5e53055aa5ce44880d5cd9910c7bbadf16f30 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 10 Jun 2011 18:07:28 +0200
Subject: [PATCH] ffdec: small cleanups

We can use or to calculate the max alignment
---
 ext/ffmpeg/gstffmpegdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 6962248..f6a62b3 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1195,7 +1195,7 @@ gst_ffmpegdec_bufferpool (GstFFMpegDec * ffmpegdec, GstCaps * caps)
 
   config = gst_buffer_pool_get_config (pool);
   gst_buffer_pool_config_set (config, caps, size, min, max, prefix, 0,
-      MAX (alignment, 15));
+      alignment | 15);
   gst_buffer_pool_set_config (pool, config);
 
   if (ffmpegdec->pool)
-- 
2.7.4