Mercurial > libavcodec.hg
changeset 3483:26b0ce29f5f5 libavcodec
cleanup
| author | michael |
|---|---|
| date | Sun, 16 Jul 2006 19:21:59 +0000 |
| parents | c08b46172204 |
| children | 9a70c6d3c653 |
| files | vp3.c |
| diffstat | 1 files changed, 3 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/vp3.c Sun Jul 16 18:55:18 2006 +0000 +++ b/vp3.c Sun Jul 16 19:21:59 2006 +0000 @@ -2648,16 +2648,9 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext gb) { Vp3DecodeContext *s = avctx->priv_data; - int major, minor, micro; - - major = get_bits(&gb, 8); /* version major */ - minor = get_bits(&gb, 8); /* version minor */ - micro = get_bits(&gb, 8); /* version micro */ - av_log(avctx, AV_LOG_INFO, "Theora bitstream version %d.%d.%d\n", - major, minor, micro); - - /* FIXME: endianess? */ - s->theora = (major << 16) | (minor << 8) | micro; + + s->theora = get_bits_long(&gb, 24); + av_log(avctx, AV_LOG_INFO, "Theora bitstream version %X\n", s->theora); /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */ /* but previous versions have the image flipped relative to vp3 */ @@ -2726,16 +2719,6 @@ return 0; } -static inline int theora_get_32bit(GetBitContext gb) -{ - int ret = get_bits(&gb, 8); - ret += get_bits(&gb, 8) << 8; - ret += get_bits(&gb, 8) << 16; - ret += get_bits(&gb, 8) << 24; - - return ret; -} - static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb) { Vp3DecodeContext *s = avctx->priv_data;