diff options
| author | Måns Rullgård <mans@mansr.com> | 2005-05-11 16:42:15 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2005-05-11 16:42:15 +0000 |
| commit | aac064b5bdf4fa8d9061086485981624c6ffd75a (patch) | |
| tree | a3dbfe74ab42b2ff9dd8bdbcb3a4e7e58d7ad5a3 /libavcodec/allcodecs.c | |
| parent | 1ed923eab332bf55fd18603ed7b66432142ded67 (diff) | |
| download | ffmpeg-aac064b5bdf4fa8d9061086485981624c6ffd75a.tar.gz | |
theora decoding using libtheora
Originally committed as revision 4218 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 9cddeb6d72..b439bbd090 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -61,7 +61,7 @@ void avcodec_register_all(void) #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 @@ void avcodec_register_all(void) #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 |