summaryrefslogtreecommitdiffstats
path: root/libavcodec/common.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-12-05 23:12:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-12-05 23:12:03 +0000
commita8380f44cfa69c204856568f5d24851fbdb1d884 (patch)
tree8d926b7bbbceb88758aaf2843052e862c6783ced /libavcodec/common.c
parent2be9f03abb2be775f4882fb87fb735bd7b5a3930 (diff)
downloadffmpeg-streaming-a8380f44cfa69c204856568f5d24851fbdb1d884.zip
ffmpeg-streaming-a8380f44cfa69c204856568f5d24851fbdb1d884.tar.gz
removing unused var & converting 64->32bit
Originally committed as revision 2567 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/common.c')
-rw-r--r--libavcodec/common.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/common.c b/libavcodec/common.c
index 9688981..ed59ea1 100644
--- 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
}
OpenPOWER on IntegriCloud