From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 19 Jul 2011 17:31:23 +0000 (+0100)
Subject: the
X-Git-Tag: 1.19.3~511^2~7406
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57157694a53be11a0dbd4694fc09eb613973c97a;p=platform%2Fupstream%2Fgstreamer.git

the
---

diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c
index 2956b49..4935ac7 100644
--- 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 */