diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-21 23:37:04 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-21 23:37:04 +0000 |
| commit | bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1 (patch) | |
| tree | 9a357059c3433584140c561c5c61421861181002 /src/dxr3 | |
| parent | 57513400ce106f016e43c966900e5215d0304010 (diff) | |
| parent | a9a29bda1ddcec1ad8fa1305987a669404075c26 (diff) | |
| download | xine-lib-bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1.tar.gz xine-lib-bdb8abcdf99d455f3f29fce1a6e9b30052bc93a1.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libdts/xine_dts_decoder.c => src/audio_dec/xine_dts_decoder.c
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
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 6faabc00f..8158bba8e 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; |