From 4abc097146a159eab3770f6b4889f5e7aa4580af Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Fri, 26 Jan 2007 12:32:23 +0000
Subject: [PATCH] remove void * used in arithmetic warnings
Originally committed as revision 7716 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/dtsdec.c | 6 +++---
libavformat/dv1394.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/dtsdec.c b/libavcodec/dtsdec.c
index 63d4b00e73a..a58a3ccb99b 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 f00d4743576..c5795ca0228 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 */
--
GitLab