[MPlayer-cvslog] r36730 - in trunk/vidix: cyberblade_vid.c ivtv_vid.c mach64_vid.c mga_vid.c nvidia_vid.c pm2_vid.c pm3_vid.c radeon_vid.c s3_vid.c sh_veu_vid.c sis_vid.c unichrome_vid.c vidix.c
reimar
subversion at mplayerhq.hu
Sat Jan 25 17:55:01 CET 2014
Author: reimar
Date: Sat Jan 25 17:55:01 2014
New Revision: 36730
Log:
vidix: move query_format struct initialization to common code.
Modified:
trunk/vidix/cyberblade_vid.c
trunk/vidix/ivtv_vid.c
trunk/vidix/mach64_vid.c
trunk/vidix/mga_vid.c
trunk/vidix/nvidia_vid.c
trunk/vidix/pm2_vid.c
trunk/vidix/pm3_vid.c
trunk/vidix/radeon_vid.c
trunk/vidix/s3_vid.c
trunk/vidix/sh_veu_vid.c
trunk/vidix/sis_vid.c
trunk/vidix/unichrome_vid.c
trunk/vidix/vidix.c
Modified: trunk/vidix/cyberblade_vid.c
==============================================================================
--- trunk/vidix/cyberblade_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/cyberblade_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -225,7 +225,6 @@ static int cyberblade_query_fourcc(vidix
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
return 0;
}
- to->depth = to->flags = 0;
return ENOSYS;
}
Modified: trunk/vidix/ivtv_vid.c
==============================================================================
--- trunk/vidix/ivtv_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/ivtv_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -411,13 +411,11 @@ int ivtv_query_fourcc(vidix_fourcc_t *to
}
if(!supports) {
- to->depth = to->flags = 0;
return ENOTSUP;
}
to->depth = VID_DEPTH_12BPP |
VID_DEPTH_15BPP | VID_DEPTH_16BPP |
VID_DEPTH_24BPP | VID_DEPTH_32BPP;
- to->flags = 0;
return 0;
}
Modified: trunk/vidix/mach64_vid.c
==============================================================================
--- trunk/vidix/mach64_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/mach64_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -881,7 +881,6 @@ static int mach64_query_fourcc(vidix_fou
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
return 0;
}
- else to->depth = to->flags = 0;
return ENOSYS;
}
Modified: trunk/vidix/mga_vid.c
==============================================================================
--- trunk/vidix/mga_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/mga_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -1302,7 +1302,6 @@ static int mga_query_fourcc(vidix_fourcc
case IMGFMT_UYVY:
break;
default:
- to->depth = to->flags = 0;
return ENOTSUP;
}
Modified: trunk/vidix/nvidia_vid.c
==============================================================================
--- trunk/vidix/nvidia_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/nvidia_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -996,7 +996,6 @@ static int nv_query_fourcc(vidix_fourcc_
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
return 0;
}
- else to->depth = to->flags = 0;
return ENOSYS;
}
Modified: trunk/vidix/pm2_vid.c
==============================================================================
--- trunk/vidix/pm2_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/pm2_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -174,7 +174,6 @@ static int pm2_query_fourcc(vidix_fourcc
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
return 0;
}
- else to->depth = to->flags = 0;
return ENOSYS;
}
Modified: trunk/vidix/pm3_vid.c
==============================================================================
--- trunk/vidix/pm3_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/pm3_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -169,7 +169,6 @@ static int pm3_query_fourcc(vidix_fourcc
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
return 0;
}
- else to->depth = to->flags = 0;
return ENOSYS;
}
Modified: trunk/vidix/radeon_vid.c
==============================================================================
--- trunk/vidix/radeon_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/radeon_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -1454,7 +1454,6 @@ static int radeon_query_fourcc(vidix_fou
VID_CAP_BLEND;
return 0;
}
- else to->depth = to->flags = 0;
return ENOSYS;
}
Modified: trunk/vidix/s3_vid.c
==============================================================================
--- trunk/vidix/s3_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/s3_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -750,9 +750,6 @@ static int s3_query_fourcc (vidix_fourcc
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
return 0;
}
- else
- to->depth = to->flags = 0;
-
return ENOSYS;
}
Modified: trunk/vidix/sh_veu_vid.c
==============================================================================
--- trunk/vidix/sh_veu_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/sh_veu_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -543,7 +543,6 @@ static int sh_veu_query_fourcc(vidix_fou
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK;
return 0;
}
- to->depth = to->flags = 0;
return ENOSYS;
}
Modified: trunk/vidix/sis_vid.c
==============================================================================
--- trunk/vidix/sis_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/sis_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -430,8 +430,7 @@ static int sis_query_fourcc(vidix_fourcc
to->depth = VID_DEPTH_8BPP | VID_DEPTH_16BPP | VID_DEPTH_32BPP;
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
return 0;
- } else
- to->depth = to->flags = 0;
+ }
return ENOSYS;
}
Modified: trunk/vidix/unichrome_vid.c
==============================================================================
--- trunk/vidix/unichrome_vid.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/unichrome_vid.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -634,8 +634,6 @@ unichrome_query_fourcc (vidix_fourcc_t *
to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
return 0;
}
- else
- to->depth = to->flags = 0;
return ENOSYS;
}
Modified: trunk/vidix/vidix.c
==============================================================================
--- trunk/vidix/vidix.c Sat Jan 25 17:54:59 2014 (r36729)
+++ trunk/vidix/vidix.c Sat Jan 25 17:55:01 2014 (r36730)
@@ -119,6 +119,8 @@ static uint32_t normalize_fourcc (uint32
int vdlQueryFourcc (VDXContext *ctx, vidix_fourcc_t *f)
{
f->fourcc = normalize_fourcc(f->fourcc);
+ f->depth = VID_DEPTH_NONE;
+ f->flags = VID_CAP_NONE;
return ctx->drv->query_fourcc (f);
}
More information about the MPlayer-cvslog
mailing list