Index: gstlame.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-ugly/ext/lame/gstlame.c,v
retrieving revision 1.110
diff -r1.110 gstlame.c
105a106,112
> #define CHECK_ERROR(command) G_STMT_START {\
>   if ((command) < 0) { \
>     GST_ERROR_OBJECT (lame, "setup failed: " G_STRINGIFY (command)); \
>     return; \
>   } \
> }G_STMT_END
> 
669,670d675
<   lame_close (lame->lgf);
<   lame->lgf = NULL;
735a741
> 	  CHECK_ERROR (lame_set_brate (lame->lgf, lame->bitrate));
738a745
> 	  CHECK_ERROR (lame_set_compression_ratio (lame->lgf, lame->compression_ratio));
741a749
> 	  CHECK_ERROR (lame_set_quality (lame->lgf, lame->quality));
744a753
> 	  CHECK_ERROR (lame_set_mode (lame->lgf, lame->mode));
747a757
> 	  CHECK_ERROR (lame_set_force_ms (lame->lgf, lame->force_ms));
750a761
> 	  CHECK_ERROR (lame_set_free_format (lame->lgf, lame->free_format));
753a765
> 	  CHECK_ERROR (lame_set_copyright (lame->lgf, lame->copyright));
756a769
> 	  CHECK_ERROR (lame_set_original (lame->lgf, lame->original));
759a773
> 	  CHECK_ERROR (lame_set_error_protection (lame->lgf, lame->error_protection));
762a777
> 	  CHECK_ERROR (lame_set_padding_type (lame->lgf, lame->padding_type));
765a781
> 	  CHECK_ERROR (lame_set_extension (lame->lgf, lame->extension));
768a785
> 	  CHECK_ERROR (lame_set_strict_ISO (lame->lgf, lame->strict_iso));
771a789
> 	  CHECK_ERROR (lame_set_disable_reservoir (lame->lgf, lame->disable_reservoir));
774a793
> 	  CHECK_ERROR (lame_set_VBR (lame->lgf, lame->vbr));
777a797
> 	  CHECK_ERROR (lame_set_VBR_q (lame->lgf, lame->vbr_quality));
780a801
> 	  CHECK_ERROR (lame_set_VBR_mean_bitrate_kbps (lame->lgf, lame->vbr_mean_bitrate));
783a805
> 	  CHECK_ERROR (lame_set_VBR_min_bitrate_kbps (lame->lgf, lame->vbr_min_bitrate));
786a809
> 	  CHECK_ERROR (lame_set_VBR_max_bitrate_kbps (lame->lgf, lame->vbr_max_bitrate));
789a813
> 	  CHECK_ERROR (lame_set_VBR_hard_min (lame->lgf, lame->vbr_hard_min));
792a817
> 	  CHECK_ERROR (lame_set_lowpassfreq (lame->lgf, lame->lowpass_freq));
795a821
> 	  CHECK_ERROR (lame_set_lowpasswidth (lame->lgf, lame->lowpass_width));
798a825
> 	  CHECK_ERROR (lame_set_highpassfreq (lame->lgf, lame->highpass_freq));
801a829
> 	  CHECK_ERROR (lame_set_highpasswidth (lame->lgf, lame->highpass_width));
804a833
> 	  CHECK_ERROR (lame_set_ATHonly (lame->lgf, lame->ath_only));
807a837
> 	  CHECK_ERROR (lame_set_ATHshort (lame->lgf, lame->ath_short));
810a841
> 	  CHECK_ERROR (lame_set_noATH (lame->lgf, lame->no_ath));
813a845
> 	  CHECK_ERROR (lame_set_ATHlower (lame->lgf, lame->ath_lower));
816a849
> 	  CHECK_ERROR (lame_set_cwlimit (lame->lgf, lame->cwlimit));
819a853
> 	  CHECK_ERROR (lame_set_allow_diff_short (lame->lgf, lame->allow_diff_short));
822a857
> 	  CHECK_ERROR (lame_set_no_short_blocks (lame->lgf, lame->no_short_blocks));
825a861
> 	  CHECK_ERROR (lame_set_emphasis (lame->lgf, lame->emphasis));
831a868
> 	  CHECK_ERROR(lame_set_preset(lame->lgf, lame->preset));
1156,1163d1192
< 
< #define CHECK_ERROR(command) G_STMT_START {\
<   if ((command) < 0) { \
<     GST_ERROR_OBJECT (lame, "setup failed: " G_STRINGIFY (command)); \
<     return FALSE; \
<   } \
< }G_STMT_END
< 
1177,1181d1205
<   lame->lgf = lame_init ();
< 
<   if (lame->lgf == NULL)
<     return FALSE;
< 
1210a1235
> #if 0
1256a1282
> #endif
1271d1296
< #undef CHECK_ERROR
