projects
/
platform
/
upstream
/
gst-libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e31b9c8
)
ffdec: small cleanups
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 10 Jun 2011 16:07:28 +0000
(18:07 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 10 Jun 2011 16:07:28 +0000
(18:07 +0200)
We can use or to calculate the max alignment
ext/ffmpeg/gstffmpegdec.c
patch
|
blob
|
history
diff --git
a/ext/ffmpeg/gstffmpegdec.c
b/ext/ffmpeg/gstffmpegdec.c
index
6962248
..
f6a62b3
100644
(file)
--- 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)