projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b8ef68
)
the
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 19 Jul 2011 17:31:23 +0000
(18:31 +0100)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 19 Jul 2011 17:31:23 +0000
(18:31 +0100)
ext/theora/gsttheoradec.c
patch
|
blob
|
history
diff --git
a/ext/theora/gsttheoradec.c
b/ext/theora/gsttheoradec.c
index 2956b493285cd69cf94d4d4c76f7c55ec910c7ae..4935ac7d2f9c0271cdaca3af08a26ed7c91bb899 100644
(file)
--- a/
ext/theora/gsttheoradec.c
+++ b/
ext/theora/gsttheoradec.c
@@
-806,13
+806,14
@@
theora_negotiate_pool (GstTheoraDec * dec, GstCaps * caps, GstVideoInfo * info)
/* we got configuration from our peer, parse them */
gst_query_parse_allocation_params (query, &size, &min, &max, &prefix,
&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;
alignment = 0;
}
- size = MAX (size, info->size);
if (pool == NULL) {
/* we did not get a pool, make one ourselves then */