[MPlayer-cvslog] CVS: main/libmpcodecs ad_libvorbis.c,1.17,1.18
Nico Sabbi CVS
syncmail at mplayerhq.hu
Fri May 13 01:32:28 CEST 2005
CVS change done by Nico Sabbi CVS
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv7571
Modified Files:
ad_libvorbis.c
Log Message:
initialize vorbis structure before calling ERROR()
Index: ad_libvorbis.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_libvorbis.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ad_libvorbis.c 12 May 2005 17:35:58 -0000 1.17
+++ ad_libvorbis.c 12 May 2005 23:32:26 -0000 1.18
@@ -72,6 +72,11 @@
return 0; \
}
+ /// Init the decoder with the 3 header packets
+ ov = (struct ov_struct_st*)malloc(sizeof(struct ov_struct_st));
+ vorbis_info_init(&ov->vi);
+ vorbis_comment_init(&vc);
+
if(! sh->wf) {
mp_msg(MSGT_DECAUDIO,MSGL_ERR,"ad_vorbis, extradata seems to be absent! exit\n");
ERROR();
@@ -117,10 +122,6 @@
hsizes[2] = sh->wf->cbSize - offset - hsizes[0] - hsizes[1];
mp_msg (MSGT_DEMUX, MSGL_V, "ad_vorbis, header sizes: %d %d %d\n", hsizes[0], hsizes[1], hsizes[2]);
- /// Init the decoder with the 3 header packets
- ov = (struct ov_struct_st*)malloc(sizeof(struct ov_struct_st));
- vorbis_info_init(&ov->vi);
- vorbis_comment_init(&vc);
for(i=0; i<3; i++) {
op.bytes = hsizes[i];
op.packet = headers[i];
More information about the MPlayer-cvslog
mailing list