summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-23 17:01:55 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-23 17:01:55 +0000
commit29f7432278681024582dbb59416578c64510d32e (patch)
tree290ff776d075b17c3d2164b124603a7a39e418bf
parentc1fd11363d90821b4f7d8c3b2e2b80a9059ecf1c (diff)
downloadmpv-29f7432278681024582dbb59416578c64510d32e.tar.bz2
mpv-29f7432278681024582dbb59416578c64510d32e.tar.xz
libmad fix (see comment)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2433 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--dec_audio.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/dec_audio.c b/dec_audio.c
index f307219e5c..7bc87d6eec 100644
--- a/dec_audio.c
+++ b/dec_audio.c
@@ -589,7 +589,12 @@ case AFM_VORBIS: {
}
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;