[xiph-commits] r12875 - in trunk/theora: include/theora lib

[j at svn.xiph.org]

Author: j
Date: 2007-04-16 00:03:00 -0700 (Mon, 16 Apr 2007)
New Revision: 12875

Modified:
   trunk/theora/include/theora/codec.h
   trunk/theora/lib/Makefile.am
Log:
enc_arch_dir all the way

Modified: trunk/theora/include/theora/codec.h
===================================================================
--- trunk/theora/include/theora/codec.h	2007-04-16 01:41:05 UTC (rev 12874)
+++ trunk/theora/include/theora/codec.h	2007-04-16 07:03:00 UTC (rev 12875)
@@ -19,11 +19,10 @@
  * 
  * \section intro Introduction
  *
- * This is the documentation for the <tt>libtheoradec</tt> and
- *  <tt>libtheoraenc</tt> C API.
- * These were written to replace <tt>libtheora</tt>, the current reference
- *  implementation for <a href="http://www.theora.org/">Theora</a>, a free,
- *  patent-unencumbered video codec.
+ * This is the documentation for <tt>libtheora</tt> C API.
+ * The current reference
+ * implementation for <a href="http://www.theora.org/">Theora</a>, a free,
+ * patent-unencumbered video codec.
  * Theora is derived from On2's VP3 codec with additional features and
  *  integration for Ogg multimedia formats by
  *  <a href="http://www.xiph.org/">the Xiph.Org Foundation</a>.
@@ -35,9 +34,6 @@
  *
  * The functions documented here are actually subdivided into two separate
  *  libraries:
- * - <tt>libtheoraenc</tt>, containing routines exclusive to the encoder.
- *   You must link to this if you use any of the functions listed in
- *    \ref encfuncs.
  * - <tt>libtheoradec</tt>, contains the decoder and shared routines.
  *   You must link to this if you use any of the functions listed in
  *    this API, i.e., those listed in \ref basefuncs and \ref decfuncs.*/

Modified: trunk/theora/lib/Makefile.am
===================================================================
--- trunk/theora/lib/Makefile.am	2007-04-16 01:41:05 UTC (rev 12874)
+++ trunk/theora/lib/Makefile.am	2007-04-16 07:03:00 UTC (rev 12875)
@@ -47,7 +47,7 @@
 	enc/dsp.c
 	
 if CPU_x86_64
-arch_dir = enc/x86_64
+enc_arch_dir = enc/x86_64
 encoder_arch_sources= \
 	$(enc_arch_dir)/dct_decode_mmx.c \
 	$(enc_arch_dir)/dsp_mmx.c \
@@ -57,7 +57,7 @@
 	$(enc_arch_dir)/fdct_mmx.c
 else
 if CPU_x86_32
-arch_dir = enc/x86_32
+enc_arch_dir = enc/x86_32
 encoder_arch_sources= \
 	$(enc_arch_dir)/dct_decode_mmx.c \
 	$(enc_arch_dir)/dsp_mmx.c \