summaryrefslogtreecommitdiff
path: root/ext/libpng
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-03-14 19:55:32 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2012-03-14 19:56:56 +0100
commit751fcf035ba27f28579cb02b630fc38afbf97620 (patch)
tree2a947c74a370ac40091c4808309ff30328a7b31e /ext/libpng
parent98c681fe5b3799a5cf5e94e2699fb038991e083b (diff)
take padding into account
Diffstat (limited to 'ext/libpng')
-rw-r--r--ext/libpng/gstpngdec.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c
index 9ad3679c0..623237efd 100644
--- a/ext/libpng/gstpngdec.c
+++ b/ext/libpng/gstpngdec.c
@@ -338,7 +338,7 @@ gst_pngdec_negotiate_pool (GstPngDec * dec, GstCaps * caps, GstVideoInfo * info)
{
GstQuery *query;
GstBufferPool *pool = NULL;
- guint size, min, max, prefix, alignment;
+ guint size, min, max, prefix, padding, alignment;
GstStructure *config;
/* find a pool for the negotiated caps now */
@@ -348,13 +348,14 @@ gst_pngdec_negotiate_pool (GstPngDec * dec, GstCaps * caps, GstVideoInfo * info)
GST_DEBUG_OBJECT (dec, "got downstream ALLOCATION hints");
/* we got configuration from our peer, parse them */
gst_query_parse_allocation_params (query, &size, &min, &max, &prefix,
- &alignment, &pool);
+ &padding, &alignment, &pool);
size = MAX (size, info->size);
} else {
GST_DEBUG_OBJECT (dec, "didn't get downstream ALLOCATION hints");
size = info->size;
min = max = 0;
prefix = 0;
+ padding = 0;
alignment = 0;
}
@@ -368,7 +369,8 @@ gst_pngdec_negotiate_pool (GstPngDec * dec, GstCaps * caps, GstVideoInfo * info)
dec->pool = pool;
config = gst_buffer_pool_get_config (pool);
- gst_buffer_pool_config_set (config, caps, size, min, max, prefix, alignment);
+ gst_buffer_pool_config_set (config, caps, size, min, max, prefix, padding,
+ alignment);
/* just set the option, if the pool can support it we will transparently use
* it through the video info API. We could also see if the pool support this
* option and only activate it then. */