diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-01-26 12:32:23 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-01-26 12:32:23 +0000 |
| commit | 4abc097146a159eab3770f6b4889f5e7aa4580af (patch) | |
| tree | a76c067cb43efb1566bd41f7a7f5e1d95aa95c9d | |
| parent | 24368c4ae4de1c8b4556b9e042ed0b29368e8b59 (diff) | |
| download | ffmpeg-4abc097146a159eab3770f6b4889f5e7aa4580af.tar.gz | |
remove void * used in arithmetic warnings
Originally committed as revision 7716 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dtsdec.c | 6 | ||||
| -rw-r--r-- | libavformat/dv1394.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dtsdec.c b/libavcodec/dtsdec.c index 63d4b00e73..a58a3ccb99 100644 --- a/libavcodec/dtsdec.c +++ b/libavcodec/dtsdec.c @@ -210,7 +210,7 @@ dts_decode_frame (AVCodecContext *avctx, void *data, int *data_size, static uint8_t buf[BUFFER_SIZE]; static uint8_t * bufptr = buf; static uint8_t * bufpos = buf + HEADER_SIZE; - + int16_t *out_samples = data; static int sample_rate; static int frame_length; static int flags; @@ -273,10 +273,10 @@ dts_decode_frame (AVCodecContext *avctx, void *data, int *data_size, { int chans; chans = channels_multi (flags); - convert2s16_multi (dts_samples (state), data, + convert2s16_multi (dts_samples (state), out_samples, flags & (DTS_CHANNEL_MASK | DTS_LFE)); - data += 256 * sizeof (int16_t) * chans; + out_samples += 256 * chans; *data_size += 256 * sizeof (int16_t) * chans; } } diff --git a/libavformat/dv1394.c b/libavformat/dv1394.c index f00d474357..c5795ca022 100644 --- a/libavformat/dv1394.c +++ b/libavformat/dv1394.c @@ -40,7 +40,7 @@ struct dv1394_data { int channel; int format; - void *ring; /* Ring buffer */ + uint8_t *ring; /* Ring buffer */ int index; /* Current frame index */ int avail; /* Number of frames available for reading */ int done; /* Number of completed frames */ |