[Ffmpeg-cvslog] r7716 - in trunk: libavcodec/dtsdec.c libavformat/dv1394.c

[bcoudurier]

Author: bcoudurier
Date: Fri Jan 26 13:32:23 2007
New Revision: 7716

Modified:
   trunk/libavcodec/dtsdec.c
   trunk/libavformat/dv1394.c

Log:
remove void * used in arithmetic warnings

Modified: trunk/libavcodec/dtsdec.c
==============================================================================
--- trunk/libavcodec/dtsdec.c	(original)
+++ trunk/libavcodec/dtsdec.c	Fri Jan 26 13:32:23 2007
@@ -210,7 +210,7 @@
   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 @@
                   {
                     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;
                   }
                 }

Modified: trunk/libavformat/dv1394.c
==============================================================================
--- trunk/libavformat/dv1394.c	(original)
+++ trunk/libavformat/dv1394.c	Fri Jan 26 13:32:23 2007
@@ -40,7 +40,7 @@
     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 */