aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-04-08 18:54:53 +0000
committerDiego Biurrun <diego@biurrun.de>2007-04-08 18:54:53 +0000
commit597cbdaf03c848877a30676b8599416d39317f35 (patch)
tree2dbf53a29cb7b5db4c691db3b1325e21a259df66
parent6f6a3e2acba7e7a6e35a925289fb06bcb01db99d (diff)
downloadffmpeg-597cbdaf03c848877a30676b8599416d39317f35.tar.gz
Only compile in Theora-specific functions if the Theora decoder has been
enabled. Also fixes some "defined but not used" warnings in that case. Originally committed as revision 8685 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vp3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 5c5c6f28a1..0a5d760135 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2367,6 +2367,7 @@ static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
return 0;
}
+#ifdef CONFIG_THEORA_DECODER
static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
{
Vp3DecodeContext *s = avctx->priv_data;
@@ -2611,7 +2612,6 @@ static int theora_decode_init(AVCodecContext *avctx)
return 0;
}
-#ifdef CONFIG_THEORA_DECODER
AVCodec theora_decoder = {
"theora",
CODEC_TYPE_VIDEO,