From ec18a61d728fcebc74aa2cc1f004d43e7f56e0ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Fri, 22 Feb 2008 14:55:57 +0000
Subject: [PATCH] ext/lame/gstlame.c: Fix broken GST_ELEMENT_ERROR macro, fixes
 compile with the Sun

Original commit message from CVS:
* ext/lame/gstlame.c: (gst_lame_sink_setcaps):
Fix broken GST_ELEMENT_ERROR macro, fixes compile with the Sun
Workshop 12 compiler, but probably also crashes (#517985).
---
 ChangeLog          | 6 ++++++
 common             | 2 +-
 ext/lame/gstlame.c | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f5b7e9528..9607eb53a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/lame/gstlame.c: (gst_lame_sink_setcaps):
+	  Fix broken GST_ELEMENT_ERROR macro, fixes compile with the Sun
+	  Workshop 12 compiler, but probably also crashes (#517985).
+
 2008-02-22  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Patch by: Thiago Sousa Santos <thiagoss at lcc dot ufcg dot edu dot br>
diff --git a/common b/common
index 135628f16d..bd6ec57040 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 135628f16d422584d3454fb9c9805e7be25760a1
+Subproject commit bd6ec57040fe3fa93e21ca440dfe494e3ee18555
diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index 6e2d72fd03..ef182e2026 100644
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -578,7 +578,7 @@ zero_output_rate:
 setup_failed:
   {
     GST_ELEMENT_ERROR (lame, LIBRARY, SETTINGS,
-        (_("Failed to configure LAME encoder. Check your encoding parameters.")), NULL);
+        (_("Failed to configure LAME encoder. Check your encoding parameters.")), (NULL));
     return FALSE;
   }
 }