eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

removing unused var & converting 64->32bit

Browse Source 
Originally committed as revision 2567 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2003-12-05 23:12:03 +00:00
parent 2be9f03abb
commit a8380f44cf
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/common.c
View File

@@ -48,7 +48,6 @@ void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size)
{ {
s->buf = buffer; s->buf = buffer;
s->buf_end = s->buf + buffer_size; s->buf_end = s->buf + buffer_size;
s->data_out_size = 0;
#ifdef ALT_BITSTREAM_WRITER #ifdef ALT_BITSTREAM_WRITER
s->index=0; s->index=0;
((uint32_t*)(s->buf))[0]=0; ((uint32_t*)(s->buf))[0]=0;
@@ -63,12 +62,12 @@ void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size)
#ifdef CONFIG_ENCODERS #ifdef CONFIG_ENCODERS
/* return the number of bits output */ /* return the number of bits output */
int64_t get_bit_count(PutBitContext *s) int get_bit_count(PutBitContext *s)
{ {
#ifdef ALT_BITSTREAM_WRITER #ifdef ALT_BITSTREAM_WRITER
return s->data_out_size * 8 + s->index; return s->index;
#else #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 #endif
} }

3
libavcodec/common.h
View File

@@ -274,12 +274,11 @@ typedef struct PutBitContext {
int bit_left; int bit_left;
uint8_t *buf, *buf_ptr, *buf_end; uint8_t *buf, *buf_ptr, *buf_end;
#endif #endif
int64_t data_out_size; /* in bytes */
} PutBitContext; } PutBitContext;
void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size); 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 align_put_bits(PutBitContext *s);
void flush_put_bits(PutBitContext *s); void flush_put_bits(PutBitContext *s);
void put_string(PutBitContext * pbc, char *s); void put_string(PutBitContext * pbc, char *s);

2
libavcodec/dv.c
View File

@@ -645,7 +645,7 @@ typedef struct EncBlockInfo {
static always_inline int dv_bits_left(PutBitContext* s) static always_inline int dv_bits_left(PutBitContext* s)
{ {
return (s->buf_end - s->buf) * 8 - 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, static always_inline void dv_encode_ac(EncBlockInfo* bi, PutBitContext* pb_pool,

1
libavformat/gif.c
View File

@@ -274,7 +274,6 @@ static int gif_image_write_image(ByteIOContext *pb,
if(pbBufPtr(&p) - p.buf > 0) { if(pbBufPtr(&p) - p.buf > 0) {
put_byte(pb, pbBufPtr(&p) - p.buf); /* byte count of the packet */ put_byte(pb, pbBufPtr(&p) - p.buf); /* byte count of the packet */
put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */ put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */
p.data_out_size += pbBufPtr(&p) - p.buf;
p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */ p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */
} }
if(left<=GIF_CHUNKS) { if(left<=GIF_CHUNKS) {