Merge with trunk R2978.

[ardour.git] / libs / ardour / gdither.cc

diff --git a/libs/ardour/gdither.cc b/libs/ardour/gdither.cc
index 3cdd7ee89e2e7284365c9c9fd4ed49bf4dc808a6..7242f857c8f94f217ab73752a72213dece277514 100644 (file)
--- a/libs/ardour/gdither.cc
+++ b/libs/ardour/gdither.cc
@@ -15,7 +15,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id$
  */
 
 #include <ardour/gdither_types_internal.h>
@@ -175,7 +174,7 @@ inline static void gdither_innner_loop(const GDitherType dt,
     const int clamp_l)
 {
     uint32_t pos, i;
-    u_int8_t *o8 = (u_int8_t*) y;
+    uint8_t *o8 = (uint8_t*) y;
     int16_t *o16 = (int16_t*) y;
     int32_t *o32 = (int32_t*) y;
     float tmp, r, ideal;