diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2008-02-22 14:55:57 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2008-02-22 14:55:57 +0000 |
commit | ec18a61d728fcebc74aa2cc1f004d43e7f56e0ea (patch) | |
tree | 2c6e8cfa21df6b9bf0795341018e3fac039a5953 | |
parent | a07c914565667a5f648048302508ca3fe7371631 (diff) |
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).
-rw-r--r-- | ChangeLog | 6 | ||||
m--------- | common | 0 | ||||
-rw-r--r-- | ext/lame/gstlame.c | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -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 -Subproject 135628f16d422584d3454fb9c9805e7be25760a +Subproject bd6ec57040fe3fa93e21ca440dfe494e3ee1855 diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c index 6e2d72fd..ef182e20 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; } } |