diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /vidix | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/fourcc.h | 1 | ||||
| -rw-r--r-- | vidix/radeon_vid.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/vidix/fourcc.h b/vidix/fourcc.h index 3b4c7919b5..e2ce256cca 100644 --- a/vidix/fourcc.h +++ b/vidix/fourcc.h @@ -51,6 +51,7 @@ #define IMGFMT_YV12 vid_fourcc('Y','V','1','2') /* 12 YVU 4:2:0 */ #define IMGFMT_I420 vid_fourcc('I','4','2','0') /* 12 YUV 4:2:0 */ #define IMGFMT_IYUV vid_fourcc('I','Y','U','V') /* 12 YUV 4:2:0 */ +#define IMGFMT_NV12 vid_fourcc('N','V','1','2') #define IMGFMT_CLPL vid_fourcc('C','L','P','L') /* 12 */ #define IMGFMT_Y800 vid_fourcc('Y','8','0','0') /* 8 Y Grayscale */ #define IMGFMT_Y8 vid_fourcc('Y','8',' ',' ') /* 8 Y Grayscale */ diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c index b72391b51d..d0bb5b878a 100644 --- a/vidix/radeon_vid.c +++ b/vidix/radeon_vid.c @@ -41,7 +41,7 @@ #include "dha.h" #include "radeon.h" -#if !defined(RAGE128) && defined(HAVE_X11) +#if !defined(RAGE128) && defined(CONFIG_X11) #include <X11/Xlib.h> static uint32_t firegl_shift = 0; #endif @@ -1168,7 +1168,7 @@ static vidix_capability_t def_cap = { 0, 0, 0, 0} }; -#if !defined(RAGE128) && defined(HAVE_X11) +#if !defined(RAGE128) && defined(CONFIG_X11) static void probe_fireGL_driver(void) { Display *dp = XOpenDisplay ((void*)0); int n = 0; @@ -1243,7 +1243,7 @@ static int radeon_probe(int verbose, int force) #endif besr.chip_flags=R_100|R_OVL_SHIFT; } -#if !defined(RAGE128) && defined(HAVE_X11) +#if !defined(RAGE128) && defined(CONFIG_X11) probe_fireGL_driver(); #endif if(idx != -1) besr.chip_flags=ati_card_ids[idx].flags; @@ -3098,7 +3098,7 @@ static int radeon_config_playback(vidix_playback_t *info) for(;nfr>0; nfr--) { radeon_overlay_off = radeon_video_size - info->frame_size*nfr; -#if !defined (RAGE128) && defined(HAVE_X11) +#if !defined (RAGE128) && defined(CONFIG_X11) radeon_overlay_off -= firegl_shift; #endif radeon_overlay_off &= 0xffff0000; @@ -3110,7 +3110,7 @@ static int radeon_config_playback(vidix_playback_t *info) for(;nfr>0; nfr--) { radeon_overlay_off = radeon_video_size - info->frame_size*nfr; -#if !defined (RAGE128) && defined(HAVE_X11) +#if !defined (RAGE128) && defined(CONFIG_X11) radeon_overlay_off -= firegl_shift; #endif radeon_overlay_off &= 0xffff0000; |