Mercurial > mplayer.hg

changeset 36634:945eab072c9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vidix: move query_format struct initialization to common code.
author reimar
date Sat, 25 Jan 2014 16:55:01 +0000
parents f8f6da5f5c57
children 0b6385acafcc
files vidix/cyberblade_vid.c vidix/ivtv_vid.c vidix/mach64_vid.c vidix/mga_vid.c vidix/nvidia_vid.c vidix/pm2_vid.c vidix/pm3_vid.c vidix/radeon_vid.c vidix/s3_vid.c vidix/sh_veu_vid.c vidix/sis_vid.c vidix/unichrome_vid.c vidix/vidix.c
diffstat 13 files changed, 3 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/vidix/cyberblade_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/cyberblade_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -225,7 +225,6 @@
 		to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
 		return 0;
 	}
-		to->depth = to->flags = 0;
 	return ENOSYS;
 }
 
--- a/vidix/ivtv_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/ivtv_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -411,13 +411,11 @@
 	}
 
 	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;
 }
 
--- a/vidix/mach64_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/mach64_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -881,7 +881,6 @@
 	to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
 	return 0;
     }
-    else  to->depth = to->flags = 0;
     return ENOSYS;
 }
 
--- a/vidix/mga_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/mga_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -1302,7 +1302,6 @@
 	case IMGFMT_UYVY:
 	    break;
 	default:
-	    to->depth = to->flags = 0;
 	    return ENOTSUP;
     }
 
--- a/vidix/nvidia_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/nvidia_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -996,7 +996,6 @@
 	to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
 	return 0;
     }
-    else  to->depth = to->flags = 0;
     return ENOSYS;
 }
 
--- a/vidix/pm2_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/pm2_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -174,7 +174,6 @@
 	to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
 	return 0;
     }
-    else  to->depth = to->flags = 0;
     return ENOSYS;
 }
 
--- a/vidix/pm3_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/pm3_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -169,7 +169,6 @@
 	to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
 	return 0;
     }
-    else  to->depth = to->flags = 0;
     return ENOSYS;
 }
 
--- a/vidix/radeon_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/radeon_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -1454,7 +1454,6 @@
 		    VID_CAP_BLEND;
 	return 0;
     }
-    else  to->depth = to->flags = 0;
     return ENOSYS;
 }
 
--- a/vidix/s3_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/s3_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -750,9 +750,6 @@
     to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
     return 0;
   }
-  else
-    to->depth = to->flags = 0;
-
   return ENOSYS;
 }
 
--- a/vidix/sh_veu_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/sh_veu_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -543,7 +543,6 @@
         to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK;
         return 0;
     }
-    to->depth = to->flags = 0;
     return ENOSYS;
 }
 
--- a/vidix/sis_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/sis_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -430,8 +430,7 @@
 	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;
 }
 
--- a/vidix/unichrome_vid.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/unichrome_vid.c	Sat Jan 25 16:55:01 2014 +0000
@@ -634,8 +634,6 @@
       to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
       return 0;
     }
-  else
-    to->depth = to->flags = 0;
   return ENOSYS;
 }
 
--- a/vidix/vidix.c	Sat Jan 25 16:54:59 2014 +0000
+++ b/vidix/vidix.c	Sat Jan 25 16:55:01 2014 +0000
@@ -119,6 +119,8 @@
 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);
 }