summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Bardiaux <mbardiaux@peaktime.be>2005-09-21 23:18:52 +0000
committerAurelien Jacobs <aurel@gnuage.org>2005-09-21 23:18:52 +0000
commit288f1e6815fc52196fd1f443d305a4822bf371a2 (patch)
treebc67d255db7ae324107160ac9861eeb09331aa94
parent62ab0b78220b0660e91528d07fe15520d6211329 (diff)
fix some pointer to intger without cast warnings (patch by Michel Bardiaux)
Originally committed as revision 4610 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/bitstream.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 9616d5f0fa..0182b630b1 100644
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -53,8 +53,10 @@ typedef struct PutBitContext {
static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size)
{
- if(buffer_size < 0)
- buffer= buffer_size= 0;
+ if(buffer_size < 0) {
+ buffer_size = 0;
+ buffer = NULL;
+ }
s->buf = buffer;
s->buf_end = s->buf + buffer_size;
@@ -676,8 +678,10 @@ static inline void init_get_bits(GetBitContext *s,
const uint8_t *buffer, int bit_size)
{
int buffer_size= (bit_size+7)>>3;
- if(buffer_size < 0 || bit_size < 0)
- buffer= buffer_size= bit_size= 0;
+ if(buffer_size < 0 || bit_size < 0) {
+ buffer_size = bit_size = 0;
+ buffer = NULL;
+ }
s->buffer= buffer;
s->size_in_bits= bit_size;