[xiph-cvs] cvs commit: theora/win32/experimental/transcoder/avi2vp3 outfile.ogg

Timothy Terriberry tterribe at xiph.org
Fri Mar 19 16:14:04 PST 2004



tterribe    04/03/19 19:14:04

  Modified:    win32/experimental/transcoder transcoder.dsp
                        transcoder_example.c
  Removed:     win32/experimental/transcoder/avi2vp3 outfile.ogg
  Log:
  A couple of clean-ups to the transcoder example.

Revision  Changes    Path
1.2       +2 -2      theora/win32/experimental/transcoder/transcoder.dsp

Index: transcoder.dsp
===================================================================
RCS file: /usr/local/cvsroot/theora/win32/experimental/transcoder/transcoder.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a/transcoder.dsp	26 Sep 2003 15:11:47 -0000	1.1
+++ b/transcoder.dsp	20 Mar 2004 00:14:04 -0000	1.2
@@ -42,7 +42,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\..\vorbis\include" /I "..\..\..\..\ogg\include" /I "..\wincompat" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\..\vorbis\include" /I "..\..\..\..\ogg\include" /I "..\wincompat" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D GETOPT_API= /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\..\vorbis\include" /I "..\..\..\..\ogg\include" /I "..\wincompat" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\..\vorbis\include" /I "..\..\..\..\ogg\include" /I "..\wincompat" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D GETOPT_API= /FD /GZ /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"

<p><p>1.4       +13 -1     theora/win32/experimental/transcoder/transcoder_example.c

Index: transcoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/theora/win32/experimental/transcoder/transcoder_example.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- a/transcoder_example.c	19 Mar 2004 23:49:12 -0000	1.3
+++ b/transcoder_example.c	20 Mar 2004 00:14:04 -0000	1.4
@@ -12,7 +12,7 @@
 
   function: example encoder application; makes an Ogg Theora/Vorbis
             file from YUV4MPEG2 and WAV input
-  last mod: $Id: transcoder_example.c,v 1.3 2004/03/19 23:49:12 giles Exp $
+  last mod: $Id: transcoder_example.c,v 1.4 2004/03/20 00:14:04 tterribe Exp $
 
  ********************************************************************/
 
@@ -35,6 +35,7 @@
 
 #ifdef _WIN32
 /*supply missing headers and functions to Win32. going to hell, I know*/
+#include <io.h>
 #include <fcntl.h>
 
 static double rint(double x)
@@ -46,6 +47,17 @@
 }
 #endif
 
+/*Copied from vorbis/sharedbook.c*/
+static int _ilog(unsigned int v){
+  int ret=0;
+  while(v){
+    ret++;
+    v>>=1;
+  }
+  return(ret);
+}
+
+
 const char *optstring = "o:a:A:v:V:";
 struct option options [] = {
   {"output",required_argument,NULL,'o'},

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.



More information about the commits mailing list