removing unused var & converting 64->32bit

Originally committed as revision 2567 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/common.c b/libavcodec/common.c
index 96889813e3b4ba8490143de48046a4b330f0320b..ed59ea1d82936a606b48a9b5ce7443abd34b73f3 100644 (file)
--- a/libavcodec/common.c
+++ b/libavcodec/common.c
@@ -48,7 +48,6 @@ void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size)
 {
     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 @@ void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size)
 #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
 }
 

diff --git a/libavcodec/common.h b/libavcodec/common.h
index f41edee4e608844f9af28e3e3a1b75470b028b82..385372f792da69e49fe6abff7a6bbb6639b3c5af 100644 (file)
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -274,12 +274,11 @@ typedef struct PutBitContext {
     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);

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 2754dca7d1851b01ce90991b34351c836585799e..48216603a05dbdfb88cb6e3a170f8da86f6b31fa 100644 (file)
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -645,7 +645,7 @@ typedef struct EncBlockInfo {
 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, 

diff --git a/libavformat/gif.c b/libavformat/gif.c
index e64bd51b15df0d705671eb75175decaa168c1dd5..7867913da231a65509960c46bb747f4fdd769f5e 100644 (file)
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -274,7 +274,6 @@ static int gif_image_write_image(ByteIOContext *pb,
         if(pbBufPtr(&p) - p.buf > 0) {
             put_byte(pb, pbBufPtr(&p) - p.buf); /* byte count of the packet */
             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 */
         }
         if(left<=GIF_CHUNKS) {