# HG changeset patch # User nicodvb # Date 1149889403 0 # Node ID f167e56c686b9e1ee18e1085f97d39b502a6b28d # Parent 5a77f8808432943b9fc79c9b8eb4a229cffb3994 moved store_ughvlc() before #ifdef HAVE_OGGVORBIS, so it can be used by other demuxers when libogg and/or libvorbis are missing diff -r 5a77f8808432 -r f167e56c686b libmpdemux/demux_ogg.c --- a/libmpdemux/demux_ogg.c Fri Jun 09 21:31:00 2006 +0000 +++ b/libmpdemux/demux_ogg.c Fri Jun 09 21:43:23 2006 +0000 @@ -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 @@ -763,22 +779,6 @@ 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;