[Mplayer-cvslog] CVS: main/libmpcodecs ad_vorbis.c,1.3,1.4

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv17527

Modified Files:
	ad_vorbis.c 
Log Message:
- functions inside of functions are invalid in icc.  replaced with #define's
patch by Joey Parrish <joey at yunamusic.com>


Index: ad_vorbis.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_vorbis.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ad_vorbis.c	28 Jun 2002 16:40:02 -0000	1.3
+++ ad_vorbis.c	22 Aug 2002 23:28:08 -0000	1.4
@@ -42,11 +42,11 @@
   ogg_packet op;
   vorbis_comment vc;
   struct ov_struct_st *ov;
-  int error(void) {
-    vorbis_comment_clear(&vc);
-    vorbis_info_clear(&ov->vi);
-    free(ov);
-    return 0;
+#define ERROR() { \
+    vorbis_comment_clear(&vc); \
+    vorbis_info_clear(&ov->vi); \
+    free(ov); \
+    return 0; \
   }
   /// Init the decoder with the 3 header packets
   ov = (struct ov_struct_st*)malloc(sizeof(struct ov_struct_st));
@@ -57,20 +57,20 @@
   /// Header
   if(vorbis_synthesis_headerin(&ov->vi,&vc,&op) <0) {
     mp_msg(MSGT_DECAUDIO,MSGL_ERR,"OggVorbis: initial (identification) header broken!\n");
-    return error();
+    ERROR();
   }
   op.bytes = ds_get_packet(sh->ds,&op.packet);
   op.b_o_s  = 0;
   /// Comments
   if(vorbis_synthesis_headerin(&ov->vi,&vc,&op) <0) {
     mp_msg(MSGT_DECAUDIO,MSGL_ERR,"OggVorbis: comment header broken!\n");
-    return error();
+    ERROR();
   }
   op.bytes = ds_get_packet(sh->ds,&op.packet);
   //// Codebook
   if(vorbis_synthesis_headerin(&ov->vi,&vc,&op)<0) {
     mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: codebook header broken!\n");
-    return error();;
+    ERROR();
   } else { /// Print the infos
     char **ptr=vc.user_comments;
     while(*ptr){