diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-06-07 22:52:29 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-06-07 22:52:29 +0000 |
| commit | 5a8691305f7ca04777b57261a941897f2b933337 (patch) | |
| tree | 852194f84799e1e78bdf42b85cb29e796740fbb8 | |
| parent | c8e73df59226e14263d5279e4c65bae92edc3f20 (diff) | |
| download | xine-lib-5a8691305f7ca04777b57261a941897f2b933337.tar.gz xine-lib-5a8691305f7ca04777b57261a941897f2b933337.tar.bz2 | |
64-bit casting int<->pointer fixes.
CVS patchset: 8018
CVS date: 2006/06/07 22:52:29
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 4 | ||||
| -rw-r--r-- | src/post/goom/goomsl_heap.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index c5199edf3..3b054afe3 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_dxr3.c,v 1.113 2006/06/02 22:18:57 dsalt Exp $ + * $Id: video_out_dxr3.c,v 1.114 2006/06/07 22:52:29 dsalt Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -1210,7 +1210,7 @@ static int dxr3_gui_data_exchange(vo_driver_t *this_gen, int data_type, void *da break; case XINE_GUI_SEND_VIDEOWIN_VISIBLE: { - int window_showing = (int)data; + long window_showing = (long)data; int val; if (!window_showing) { llprintf(LOG_VID, "Hiding video window and diverting video to TV\n"); diff --git a/src/post/goom/goomsl_heap.c b/src/post/goom/goomsl_heap.c index 73943bf95..6ec91a46c 100644 --- a/src/post/goom/goomsl_heap.c +++ b/src/post/goom/goomsl_heap.c @@ -39,7 +39,7 @@ static void align_it(GoomHeap *_this, int alignment) { if ((alignment > 1) && (_this->number_of_arrays>0)) { void *last_array = _this->arrays[_this->number_of_arrays - 1]; - int last_address = (int)last_array + _this->consumed_in_last_array; + long last_address = (long)last_array + _this->consumed_in_last_array; int decal = (last_address % alignment); if (decal != 0) { _this->consumed_in_last_array += alignment - decal; |