Mercurial > libavcodec.hg

diff allcodecs.c @ 2665:5ea2a7f74817 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
theora decoding using libtheora
author mru
date Wed, 11 May 2005 16:42:15 +0000
parents e2780f828440
children 4fe1c19fc7a3
line wrap: on
line diff
--- a/allcodecs.c	Wed May 11 01:50:46 2005 +0000
+++ b/allcodecs.c	Wed May 11 16:42:15 2005 +0000
@@ -61,7 +61,7 @@
 #endif
 #ifdef CONFIG_LIBTHEORA
 #ifdef CONFIG_OGGTHEORA_ENCODER
-    register_avcodec(&oggtheora_encoder);
+//    register_avcodec(&oggtheora_encoder);
 #endif //CONFIG_OGGTHEORA_ENCODER
 #ifdef CONFIG_OGGTHEORA_DECODER
     register_avcodec(&oggtheora_decoder);
@@ -358,7 +358,7 @@
 #ifdef CONFIG_VP3_DECODER
     register_avcodec(&vp3_decoder);
 #endif //CONFIG_VP3_DECODER
-#ifdef CONFIG_THEORA_DECODER
+#if (defined CONFIG_THEORA_DECODER && !defined CONFIG_LIBTHEORA)
     register_avcodec(&theora_decoder);
 #endif //CONFIG_THEORA_DECODER
 #ifdef CONFIG_ASV1_DECODER