summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-07 23:54:55 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-07 23:54:55 +0200
commit62653987dc6185d17533936465571e0b7ddc2750 (patch)
tree0b8712ce4f7b3e524c1009ea7d1b9b19dfe7021b
parentd6cde0db71f269b41d7d6e60bc0be838fc5be675 (diff)
downloadxine-lib-62653987dc6185d17533936465571e0b7ddc2750.tar.gz
xine-lib-62653987dc6185d17533936465571e0b7ddc2750.tar.bz2
Apply patch sent to FFmpeg mailing list to fix building of VP3 decoder without Theora decoder.
-rw-r--r--contrib/ffmpeg/libavcodec/vp3.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/ffmpeg/libavcodec/vp3.c b/contrib/ffmpeg/libavcodec/vp3.c
index 0d882da32..bf17c2da7 100644
--- a/contrib/ffmpeg/libavcodec/vp3.c
+++ b/contrib/ffmpeg/libavcodec/vp3.c
@@ -2570,6 +2570,7 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
return 0;
}
+#if ENABLE_THEORA_DECODER
static int theora_decode_init(AVCodecContext *avctx)
{
Vp3DecodeContext *s = avctx->priv_data;
@@ -2633,6 +2634,7 @@ static int theora_decode_init(AVCodecContext *avctx)
vp3_decode_init(avctx);
return 0;
}
+#endif
AVCodec vp3_decoder = {
"vp3",
@@ -2647,6 +2649,7 @@ AVCodec vp3_decoder = {
NULL
};
+#if ENABLE_THEORA_DECODER
AVCodec theora_decoder = {
"theora",
CODEC_TYPE_VIDEO,
@@ -2659,3 +2662,4 @@ AVCodec theora_decoder = {
0,
NULL
};
+#endif