summaryrefslogtreecommitdiff
path: root/libavcodec/allcodecs.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-07-31 20:56:15 +0000
committerMåns Rullgård <mans@mansr.com>2006-07-31 20:56:15 +0000
commit6c9ce82f7464cf2a765854a60ca51e1386a4de80 (patch)
tree8362c65bdf0fb365968bfa61d5f22c1a1cc6c131 /libavcodec/allcodecs.c
parent98a2582f49fc20fca4315fcf2e1881f281c6c065 (diff)
remove libtheora wrapper
Originally committed as revision 5873 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r--libavcodec/allcodecs.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 56730d71c7..89e42f9b08 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -59,11 +59,6 @@ void avcodec_register_all(void)
register_avcodec(&oggvorbis_decoder);
#endif //CONFIG_OGGVORBIS_DECODER
#endif
-#ifdef CONFIG_LIBTHEORA
-#ifdef CONFIG_OGGTHEORA_DECODER
- register_avcodec(&oggtheora_decoder);
-#endif //CONFIG_OGGTHEORA_DECODER
-#endif
#ifdef CONFIG_FAAC
#ifdef CONFIG_FAAC_ENCODER
register_avcodec(&faac_encoder);
@@ -375,7 +370,7 @@ void avcodec_register_all(void)
#ifdef CONFIG_VP3_DECODER
register_avcodec(&vp3_decoder);
#endif //CONFIG_VP3_DECODER
-#if (defined CONFIG_THEORA_DECODER && !defined CONFIG_LIBTHEORA)
+#ifdef CONFIG_THEORA_DECODER
register_avcodec(&theora_decoder);
#endif //CONFIG_THEORA_DECODER
#ifdef CONFIG_ASV1_DECODER