[MPlayer-cvslog] r18670 - trunk/libmpdemux/demux_ogg.c

[nicodvb]

Author: nicodvb
Date: Fri Jun  9 23:43:23 2006
New Revision: 18670

Modified:
   trunk/libmpdemux/demux_ogg.c

Log:
moved store_ughvlc() before #ifdef HAVE_OGGVORBIS, so it can be used by other demuxers when libogg and/or libvorbis are missing

Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c	(original)
+++ trunk/libmpdemux/demux_ogg.c	Fri Jun  9 23:43:23 2006
@@ -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 @@
 
 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;