mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-27 09:52:17 +00:00
remove void * used in arithmetic warnings
Originally committed as revision 7716 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
24368c4ae4
commit
4abc097146
@ -210,7 +210,7 @@ dts_decode_frame (AVCodecContext *avctx, void *data, int *data_size,
|
|||||||
static uint8_t buf[BUFFER_SIZE];
|
static uint8_t buf[BUFFER_SIZE];
|
||||||
static uint8_t * bufptr = buf;
|
static uint8_t * bufptr = buf;
|
||||||
static uint8_t * bufpos = buf + HEADER_SIZE;
|
static uint8_t * bufpos = buf + HEADER_SIZE;
|
||||||
|
int16_t *out_samples = data;
|
||||||
static int sample_rate;
|
static int sample_rate;
|
||||||
static int frame_length;
|
static int frame_length;
|
||||||
static int flags;
|
static int flags;
|
||||||
@ -273,10 +273,10 @@ dts_decode_frame (AVCodecContext *avctx, void *data, int *data_size,
|
|||||||
{
|
{
|
||||||
int chans;
|
int chans;
|
||||||
chans = channels_multi (flags);
|
chans = channels_multi (flags);
|
||||||
convert2s16_multi (dts_samples (state), data,
|
convert2s16_multi (dts_samples (state), out_samples,
|
||||||
flags & (DTS_CHANNEL_MASK | DTS_LFE));
|
flags & (DTS_CHANNEL_MASK | DTS_LFE));
|
||||||
|
|
||||||
data += 256 * sizeof (int16_t) * chans;
|
out_samples += 256 * chans;
|
||||||
*data_size += 256 * sizeof (int16_t) * chans;
|
*data_size += 256 * sizeof (int16_t) * chans;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ struct dv1394_data {
|
|||||||
int channel;
|
int channel;
|
||||||
int format;
|
int format;
|
||||||
|
|
||||||
void *ring; /* Ring buffer */
|
uint8_t *ring; /* Ring buffer */
|
||||||
int index; /* Current frame index */
|
int index; /* Current frame index */
|
||||||
int avail; /* Number of frames available for reading */
|
int avail; /* Number of frames available for reading */
|
||||||
int done; /* Number of completed frames */
|
int done; /* Number of completed frames */
|
||||||
|
Loading…
Reference in New Issue
Block a user