diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-29 01:32:03 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-29 01:32:03 +0300 |
| commit | 4a36b51ea62bae47ea9bf8df3031c88a1992b7a6 (patch) | |
| tree | 8ade74ff57f052e87f36b763703ffc03af823001 /vidix | |
| parent | c73217c07a98013887f507849c18eeac1257df58 (diff) | |
| parent | 45b7b9374bb2a772baa34a52d1abac11c939de15 (diff) | |
| download | mpv-4a36b51ea62bae47ea9bf8df3031c88a1992b7a6.tar.bz2 mpv-4a36b51ea62bae47ea9bf8df3031c88a1992b7a6.tar.xz | |
Merge svn changes up to r29455
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/ivtv_vid.c | 8 | ||||
| -rw-r--r-- | vidix/radeon_vid.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vidix/ivtv_vid.c b/vidix/ivtv_vid.c index 5cfc7a7e19..16e44928af 100644 --- a/vidix/ivtv_vid.c +++ b/vidix/ivtv_vid.c @@ -231,6 +231,8 @@ int ivtv_probe(int verbose, int force) pciinfo_t lst[MAX_PCI_DEVICES]; int err = 0; unsigned int i, num_pci = 0; + unsigned char yuv_device_number = 48, yuv_device = 48 + fb_number; + char yuv_device_name[] = "/dev/videoXXX\0"; if(verbose) printf(IVTV_MSG"probe\n"); @@ -302,9 +304,6 @@ card_found: } /* Try to find YUV device */ - unsigned char yuv_device_number = 48, yuv_device = 48 + fb_number; - char yuv_device_name[] = "/dev/videoXXX\0"; - do { sprintf(yuv_device_name, "/dev/video%u", yuv_device); yuvdev = open(yuv_device_name, O_RDWR); @@ -399,10 +398,11 @@ int ivtv_get_caps(vidix_capability_t *to) int ivtv_query_fourcc(vidix_fourcc_t *to) { + int supports = 0; + if(ivtv_verbose) printf(IVTV_MSG"query fourcc (%x)\n", to->fourcc); - int supports = 0; switch(to->fourcc) { case IMGFMT_YV12: diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c index 7a9d9d086d..ee8aa23109 100644 --- a/vidix/radeon_vid.c +++ b/vidix/radeon_vid.c @@ -831,7 +831,7 @@ static void radeon_engine_restore( void ) (pitch64 << 22)); radeon_fifo_wait(1); -#if defined(WORDS_BIGENDIAN) +#if HAVE_BIGENDIAN OUTREGP(DP_DATATYPE, HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN); #else |