diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-04-08 18:52:03 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-04-08 18:52:03 +0000 |
| commit | 6f6a3e2acba7e7a6e35a925289fb06bcb01db99d (patch) | |
| tree | b29f1fa288e71d0dbf024d2f5380e371f71b59dc /libavcodec | |
| parent | d7455a1c1833854ed4ed7eaa56b511b2543e937a (diff) | |
| download | ffmpeg-6f6a3e2acba7e7a6e35a925289fb06bcb01db99d.tar.gz | |
cosmetics: Move one code block to save an #ifdef in the next commit.
Originally committed as revision 8684 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vp3.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 30ac2b176c..5c5c6f28a1 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2611,30 +2611,30 @@ static int theora_decode_init(AVCodecContext *avctx) return 0; } -AVCodec vp3_decoder = { - "vp3", +#ifdef CONFIG_THEORA_DECODER +AVCodec theora_decoder = { + "theora", CODEC_TYPE_VIDEO, - CODEC_ID_VP3, + CODEC_ID_THEORA, sizeof(Vp3DecodeContext), - vp3_decode_init, + theora_decode_init, NULL, vp3_decode_end, vp3_decode_frame, 0, NULL }; +#endif -#ifdef CONFIG_THEORA_DECODER -AVCodec theora_decoder = { - "theora", +AVCodec vp3_decoder = { + "vp3", CODEC_TYPE_VIDEO, - CODEC_ID_THEORA, + CODEC_ID_VP3, sizeof(Vp3DecodeContext), - theora_decode_init, + vp3_decode_init, NULL, vp3_decode_end, vp3_decode_frame, 0, NULL }; -#endif |