diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-22 23:28:08 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-22 23:28:08 +0000 |
commit | 0f2d1d6b54e1f9e7abef1d9332aea86f92d31e91 (patch) | |
tree | e33745966cecea699e33ead2f2dffedbb2da44e9 | |
parent | 177d2185e928d7b7332e9e1bfa6d38212ea7cc9b (diff) | |
download | mpv-0f2d1d6b54e1f9e7abef1d9332aea86f92d31e91.tar.bz2 mpv-0f2d1d6b54e1f9e7abef1d9332aea86f92d31e91.tar.xz |
- functions inside of functions are invalid in icc. replaced with #define's
patch by Joey Parrish <joey@yunamusic.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7072 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpcodecs/ad_vorbis.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpcodecs/ad_vorbis.c b/libmpcodecs/ad_vorbis.c index c0c91f42e4..872c523b87 100644 --- a/libmpcodecs/ad_vorbis.c +++ b/libmpcodecs/ad_vorbis.c @@ -42,11 +42,11 @@ static int init(sh_audio_t *sh) 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 @@ static int init(sh_audio_t *sh) /// 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){ |