Mercurial > libavcodec.hg
comparison vp3.c @ 3490:b43d45362038 libavcodec
fix playback of theora.ogg on mphq patch by (matthieu castet %% castet dat matthieu ot free dat fr %%)
author | michael |
---|---|
date | Mon, 17 Jul 2006 10:44:53 +0000 |
parents | 9aacd9410e57 |
children | 6eadb7c9f569 |
comparison
equal
deleted
inserted
replaced
3489:9aacd9410e57 | 3490:b43d45362038 |
---|---|
2626 { | 2626 { |
2627 skip_bits(gb, 24); /* frame width */ | 2627 skip_bits(gb, 24); /* frame width */ |
2628 skip_bits(gb, 24); /* frame height */ | 2628 skip_bits(gb, 24); /* frame height */ |
2629 } | 2629 } |
2630 | 2630 |
2631 if (s->theora >= 0x030200) { | |
2631 skip_bits(gb, 8); /* offset x */ | 2632 skip_bits(gb, 8); /* offset x */ |
2632 skip_bits(gb, 8); /* offset y */ | 2633 skip_bits(gb, 8); /* offset y */ |
2634 } | |
2633 | 2635 |
2634 skip_bits(gb, 32); /* fps numerator */ | 2636 skip_bits(gb, 32); /* fps numerator */ |
2635 skip_bits(gb, 32); /* fps denumerator */ | 2637 skip_bits(gb, 32); /* fps denumerator */ |
2636 skip_bits(gb, 24); /* aspect numerator */ | 2638 skip_bits(gb, 24); /* aspect numerator */ |
2637 skip_bits(gb, 24); /* aspect denumerator */ | 2639 skip_bits(gb, 24); /* aspect denumerator */ |
2816 av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80); | 2818 av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80); |
2817 break; | 2819 break; |
2818 } | 2820 } |
2819 if(8*op_bytes != get_bits_count(&gb)) | 2821 if(8*op_bytes != get_bits_count(&gb)) |
2820 av_log(avctx, AV_LOG_ERROR, "%d bits left in packet %X\n", 8*op_bytes - get_bits_count(&gb), ptype); | 2822 av_log(avctx, AV_LOG_ERROR, "%d bits left in packet %X\n", 8*op_bytes - get_bits_count(&gb), ptype); |
2823 if (s->theora < 0x030200) | |
2824 break; | |
2821 } | 2825 } |
2822 | 2826 |
2823 vp3_decode_init(avctx); | 2827 vp3_decode_init(avctx); |
2824 return 0; | 2828 return 0; |
2825 } | 2829 } |