#! /bin/sh /usr/share/dpatch/dpatch-run
## 04-linux_types-s.dpatch by Elias Mussi <elias@mussicorp.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_ffmpeg.c directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_ffmpeg.c
--- directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_ffmpeg.c	2008-05-21 13:46:04.000000000 -0300
+++ directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_ffmpeg.c	2008-05-26 12:47:13.000000000 -0300
@@ -325,7 +325,7 @@
 #endif
 }
 
-static inline __s64
+static inline s64
 get_stream_clock( IDirectFBVideoProvider_FFmpeg_data *data )
 {
 #ifdef HAVE_FUSIONSOUND
@@ -680,7 +680,7 @@
           
           for (pkt_data = pkt.data, pkt_size = pkt.size; pkt_size > 0;) {
                decoded = avcodec_decode_audio( data->audio.ctx, 
-                                               (__s16*)&buf[size], &len, 
+                                               (s16*)&buf[size], &len, 
                                                pkt_data, pkt_size );
                if (decoded < 0)
                     break;
diff -urNad directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c
--- directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c	2008-05-26 12:40:35.000000000 -0300
+++ directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c	2008-05-26 12:40:36.000000000 -0300
@@ -686,9 +686,9 @@
      IDirectFBVideoProvider_Libmpeg3_data *data =
           (IDirectFBVideoProvider_Libmpeg3_data*) ctx;
 
-     __s16 buffer[data->audio.samples_per_block * data->audio.channels];
-     __s16 left[data->audio.samples_per_block];
-     __s16 right[data->audio.samples_per_block];
+     s16 buffer[data->audio.samples_per_block * data->audio.channels];
+     s16 left[data->audio.samples_per_block];
+     s16 right[data->audio.samples_per_block];
 
      /* calculate audio position */
      long audio_pos = (long) ((double)mpeg3_get_frame (data->file, 0) *
diff -urNad directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c
--- directfb-extra~/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c	2008-05-26 12:40:35.000000000 -0300
+++ directfb-extra/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_openquicktime.c	2008-05-26 12:40:36.000000000 -0300
@@ -672,9 +672,9 @@
      IDirectFBVideoProvider_OpenQuicktime_data *data =
           (IDirectFBVideoProvider_OpenQuicktime_data*) ctx;
 
-     __s16 buffer[data->audio.samples_per_block * data->audio.channels];
-     __s16 left[data->audio.samples_per_block];
-     __s16 right[data->audio.samples_per_block];
+     s16 buffer[data->audio.samples_per_block * data->audio.channels];
+     s16 left[data->audio.samples_per_block];
+     s16 right[data->audio.samples_per_block];
 
      /* calculate audio position */
      long audio_pos = (long) ((double)quicktime_video_position (data->file, 0) *