diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-09 21:43:23 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-09 21:43:23 +0000 |
commit | 7535dc582a6f2e4ee88e222967a8ff7df01f8347 (patch) | |
tree | b85c28388c51ae0e3dbae4619b67155ab41a79ef | |
parent | cd0e349ae63a3355fd39b72d5fc1f30c821d8d14 (diff) |
moved store_ughvlc() before #ifdef HAVE_OGGVORBIS, so it can be used by other demuxers when libogg and/or libvorbis are missing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18670 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdemux/demux_ogg.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index e922e7fa8c..8c4046d3fd 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -1,6 +1,22 @@ #include "config.h" +unsigned int store_ughvlc(unsigned char *s, unsigned int v) +{ + unsigned int n = 0; + + while(v >= 0xff) + { + *s++ = 0xff; + v -= 0xff; + n++; + } + *s = v; + n++; + + return n; +} + #ifdef HAVE_OGGVORBIS #include <stdlib.h> @@ -763,22 +779,6 @@ char *demux_ogg_sub_lang(demuxer_t *demuxer, int index) { static void demux_close_ogg(demuxer_t* demuxer); -unsigned int store_ughvlc(unsigned char *s, unsigned int v) -{ - unsigned int n = 0; - - while(v >= 0xff) - { - *s++ = 0xff; - v -= 0xff; - n++; - } - *s = v; - n++; - - return n; -} - static void fixup_vorbis_wf(sh_audio_t *sh, ogg_demuxer_t *od) { int i, offset; |