[SCM] libav/experimental: Only compile in Theora-specific functions if the Theora decoder has been enabled. Also fixes some "defined but not used" warnings in that case.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 597cbdaf03c848877a30676b8599416d39317f35
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sun Apr 8 18:54:53 2007 +0000

    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

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 5c5c6f2..0a5d760 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,

-- 
Libav/FFmpeg packaging