[Mplayer-cvslog] CVS: main dec_audio.c,1.46,1.47

Alex Beregszaszi alex at mplayer.dev.hu
Tue Oct 23 19:01:58 CEST 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv4870

Modified Files:
	dec_audio.c 
Log Message:
libmad fix (see comment)

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- dec_audio.c	23 Oct 2001 14:11:53 -0000	1.46
+++ dec_audio.c	23 Oct 2001 17:01:55 -0000	1.47
@@ -589,7 +589,12 @@
        }
      
      sh_audio->channels=2; // hack
+/* var. name changed in 0.13.0 (beta) (libmad/CHANGES) -- alex */
+#if (MAD_VERSION_MAJOR >= 0) && (MAD_VERSION_MINOR >= 13)
+     sh_audio->samplerate=mad_frame.header.samplerate;
+#else
      sh_audio->samplerate=mad_frame.header.sfreq;
+#endif
      sh_audio->i_bps=mad_frame.header.bitrate;
      printf(__FILE__ ":%d:mad: continuing\n", __LINE__);
      break;




More information about the MPlayer-cvslog mailing list