aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-04-08 18:50:18 +0000
committerDiego Biurrun <diego@biurrun.de>2007-04-08 18:50:18 +0000
commitd7455a1c1833854ed4ed7eaa56b511b2543e937a (patch)
tree5d323eed14f996bbdf08842a529ad7e26680b140
parent51cea49ab453755b55b07000c879749bc1b8a406 (diff)
downloadffmpeg-d7455a1c1833854ed4ed7eaa56b511b2543e937a.tar.gz
Remove #if 0 code.
Originally committed as revision 8683 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vp3.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 750952ff7d..30ac2b176c 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -331,8 +331,6 @@ typedef struct Vp3DecodeContext {
int bounding_values_array[256];
} Vp3DecodeContext;
-static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb);
-
/************************************************************************
* VP3 specific functions
************************************************************************/
@@ -2141,28 +2139,8 @@ static int vp3_decode_frame(AVCodecContext *avctx,
if (s->theora && get_bits1(&gb))
{
-#if 1
av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n");
return -1;
-#else
- int ptype = get_bits(&gb, 7);
-
- skip_bits(&gb, 6*8); /* "theora" */
-
- switch(ptype)
- {
- case 1:
- theora_decode_comments(avctx, &gb);
- break;
- case 2:
- theora_decode_tables(avctx, &gb);
- init_dequantizer(s);
- break;
- default:
- av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype);
- }
- return buf_size;
-#endif
}
s->keyframe = !get_bits1(&gb);