Mercurial > libavcodec.hg
changeset 1660:806afb8e9085 libavcodec
removing unused var & converting 64->32bit
| author | michael |
|---|---|
| date | Fri, 05 Dec 2003 23:12:03 +0000 |
| parents | 3075fc11a974 |
| children | 4c9fd29f1606 |
| files | common.c common.h dv.c |
| diffstat | 3 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/common.c Fri Dec 05 01:03:12 2003 +0000 +++ b/common.c Fri Dec 05 23:12:03 2003 +0000 @@ -48,7 +48,6 @@ { s->buf = buffer; s->buf_end = s->buf + buffer_size; - s->data_out_size = 0; #ifdef ALT_BITSTREAM_WRITER s->index=0; ((uint32_t*)(s->buf))[0]=0; @@ -63,12 +62,12 @@ #ifdef CONFIG_ENCODERS /* return the number of bits output */ -int64_t get_bit_count(PutBitContext *s) +int get_bit_count(PutBitContext *s) { #ifdef ALT_BITSTREAM_WRITER - return s->data_out_size * 8 + s->index; + return s->index; #else - return (s->buf_ptr - s->buf + s->data_out_size) * 8 + 32 - (int64_t)s->bit_left; + return (s->buf_ptr - s->buf) * 8 + 32 - s->bit_left; #endif }
--- a/common.h Fri Dec 05 01:03:12 2003 +0000 +++ b/common.h Fri Dec 05 23:12:03 2003 +0000 @@ -274,12 +274,11 @@ int bit_left; uint8_t *buf, *buf_ptr, *buf_end; #endif - int64_t data_out_size; /* in bytes */ } PutBitContext; void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size); -int64_t get_bit_count(PutBitContext *s); /* XXX: change function name */ +int get_bit_count(PutBitContext *s); /* XXX: change function name */ void align_put_bits(PutBitContext *s); void flush_put_bits(PutBitContext *s); void put_string(PutBitContext * pbc, char *s);
--- a/dv.c Fri Dec 05 01:03:12 2003 +0000 +++ b/dv.c Fri Dec 05 23:12:03 2003 +0000 @@ -645,7 +645,7 @@ static always_inline int dv_bits_left(PutBitContext* s) { return (s->buf_end - s->buf) * 8 - - ((s->buf_ptr - s->buf + s->data_out_size) * 8 + 32 - (int64_t)s->bit_left); + ((s->buf_ptr - s->buf) * 8 + 32 - (int64_t)s->bit_left); } static always_inline void dv_encode_ac(EncBlockInfo* bi, PutBitContext* pb_pool,