diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-12-16 11:45:23 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-12-16 11:45:23 +0200 |
| commit | a541a6e710239d3a2d00a1f07e8afa8e50f05594 (patch) | |
| tree | 1015e6a3d4a2f94adf47023e3a64ca8b1d2d22c2 /src/dxr3 | |
| parent | 479c80505dca5c15a1ea17129d426d95d1aa04ee (diff) | |
| parent | 6b454a7621efa197b3f922c1ea840b359ac573b2 (diff) | |
| download | xine-lib-a541a6e710239d3a2d00a1f07e8afa8e50f05594.tar.gz xine-lib-a541a6e710239d3a2d00a1f07e8afa8e50f05594.tar.bz2 | |
Merge
Diffstat (limited to 'src/dxr3')
| -rw-r--r-- | src/dxr3/video_out_dxr3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dxr3/video_out_dxr3.h b/src/dxr3/video_out_dxr3.h index 12cc3b76f..7e24781bf 100644 --- a/src/dxr3/video_out_dxr3.h +++ b/src/dxr3/video_out_dxr3.h @@ -131,7 +131,7 @@ typedef struct dxr3_frame_s { vo_frame_t vo_frame; uint32_t oheight; int aspect, pan_scan; - uint8_t *mem; /* allocated for YV12 or YUY2 buffers */ + void *mem; /* allocated for YV12 or YUY2 buffers */ uint8_t *real_base[3]; /* yuv/yuy2 buffers in mem aligned on 16 */ int swap_fields; /* shifts Y buffer one line to exchange odd/even lines */ } dxr3_frame_t; |