[xiph-commits] r16190 - trunk/ffmpeg2theora/src

[j at svn.xiph.org]

Author: j
Date: 2009-07-02 00:54:12 -0700 (Thu, 02 Jul 2009)
New Revision: 16190

Modified:
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
   trunk/ffmpeg2theora/src/theorautils.h
Log:
print oshash properly on windows in ogg comment

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-07-01 01:46:16 UTC (rev 16189)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-07-02 07:54:12 UTC (rev 16190)
@@ -2183,8 +2183,12 @@
     }
     if (av_open_input_file(&convert->context, inputfile_name, input_fmt, 0, formatParams) >= 0) {
         if (av_find_stream_info(convert->context) >= 0) {
-                sprintf(info.oshash,"%qx", gen_oshash(inputfile_name));
 #ifdef WIN32
+            sprintf(info.oshash,"%016I64x", gen_oshash(inputfile_name));
+#else
+            sprintf(info.oshash,"%016qx", gen_oshash(inputfile_name));
+#endif
+#ifdef WIN32
                 if (!strcmp(outputfile_name,"-") || !strcmp(outputfile_name,"/dev/stdout")) {
                     _setmode(_fileno(stdout), _O_BINARY);
                     info.outfile = stdout;

Modified: trunk/ffmpeg2theora/src/theorautils.h
===================================================================
--- trunk/ffmpeg2theora/src/theorautils.h	2009-07-01 01:46:16 UTC (rev 16189)
+++ trunk/ffmpeg2theora/src/theorautils.h	2009-07-02 07:54:12 UTC (rev 16190)
@@ -60,7 +60,7 @@
     /* the file the mixed ogg stream is written to */
     FILE *outfile;
 
-    char oshash[16];
+    char oshash[32];
     int audio_only;
     int video_only;
     int with_skeleton;