RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

- functions inside of functions are invalid in icc. replaced with #define's

Browse Source 
patch by Joey Parrish <joey@yunamusic.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7072 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-08-22 23:28:08 +00:00
parent 177d2185e9
commit 0f2d1d6b54
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libmpcodecs/ad_vorbis.c
View File

@ -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){