[xiph-commits] r17014 - in trunk/vorbis-tools: . oggenc

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-03-24 01:16:44 -0700 (Wed, 24 Mar 2010)
New Revision: 17014

Modified:
   trunk/vorbis-tools/configure.ac
   trunk/vorbis-tools/oggenc/oggenc.c
Log:
Fixes Trac #1510



Modified: trunk/vorbis-tools/configure.ac
===================================================================
--- trunk/vorbis-tools/configure.ac	2010-03-24 08:11:06 UTC (rev 17013)
+++ trunk/vorbis-tools/configure.ac	2010-03-24 08:16:44 UTC (rev 17014)
@@ -166,6 +166,7 @@
 
 SOCKET_LIBS=
 AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
+AC_CHECK_LIB(network, socket, SOCKET_LIBS="-lnetwork")
 AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")
 
 

Modified: trunk/vorbis-tools/oggenc/oggenc.c
===================================================================
--- trunk/vorbis-tools/oggenc/oggenc.c	2010-03-24 08:11:06 UTC (rev 17013)
+++ trunk/vorbis-tools/oggenc/oggenc.c	2010-03-24 08:16:44 UTC (rev 17014)
@@ -305,14 +305,15 @@
             {
                 /* Create a filename from existing filename, replacing extension with .ogg or .oga */
                 char *start, *end;
-				char *extension;
+                char *extension;
 
+                /* if adding Skeleton or Kate, we're not Vorbis I anymore */
+                extension = (opt.with_skeleton || opt.lyrics_count>0) ? ".oga" : ".ogg";
+
                 start = infiles[i];
                 end = strrchr(infiles[i], '.');
                 end = end?end:(start + strlen(infiles[i])+1);
 
-                /* if adding Skeleton or Kate, we're not Vorbis I anymore */
-                extension = (opt.with_skeleton || opt.lyrics_count>0) ? ".oga" : ".ogg";
                 out_fn = malloc(end - start + 5);
                 strncpy(out_fn, start, end-start);
                 out_fn[end-start] = 0;