From 02eb69fc5ceeddffa6e079edca3986fe56e4aa64 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 23 Sep 2008 20:38:30 +0000
Subject: Remove pointless and gcc-specific __attribute__ ((unused)).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27656 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 vidix/ivtv_vid.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'vidix/ivtv_vid.c')

diff --git a/vidix/ivtv_vid.c b/vidix/ivtv_vid.c
index 15bf38d85c..314efcab39 100644
--- a/vidix/ivtv_vid.c
+++ b/vidix/ivtv_vid.c
@@ -90,7 +90,7 @@ static vidix_capability_t ivtv_cap =
 };
 
 static void de_macro_y(unsigned char *src, unsigned char *dst,
-	unsigned int w, unsigned int h, int src_x, int src_y, int height __attribute__ ((unused)), int width)
+	unsigned int w, unsigned int h, int src_x, int src_y, int height, int width)
 {
 	unsigned int x, y, i;
 	unsigned char *dst_2;
@@ -221,7 +221,7 @@ static void de_macro_uv(unsigned char *srcu, unsigned char *srcv,
 	}
 }
 
-int ivtv_probe(int verbose,int force __attribute__ ((unused)))
+int ivtv_probe(int verbose)
 {
 	unsigned char fb_number = 0;
 	char *device_name = NULL;
@@ -356,7 +356,7 @@ yuv_found:
 	return 0;
 }
 
-int ivtv_init(const char *args __attribute__ ((unused)))
+int ivtv_init(void)
 {
 	if(ivtv_verbose)
 		printf(IVTV_MSG"init\n");
-- 
cgit v1.2.3


From fdb59804aae526dd690616badf57a3c1df46d992 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 23 Sep 2008 20:53:08 +0000
Subject: Restore function parameters mistakenly removed in previous commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27657 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 vidix/ivtv_vid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'vidix/ivtv_vid.c')

diff --git a/vidix/ivtv_vid.c b/vidix/ivtv_vid.c
index 314efcab39..d190894aa3 100644
--- a/vidix/ivtv_vid.c
+++ b/vidix/ivtv_vid.c
@@ -221,7 +221,7 @@ static void de_macro_uv(unsigned char *srcu, unsigned char *srcv,
 	}
 }
 
-int ivtv_probe(int verbose)
+int ivtv_probe(int verbose, int force)
 {
 	unsigned char fb_number = 0;
 	char *device_name = NULL;
@@ -356,7 +356,7 @@ yuv_found:
 	return 0;
 }
 
-int ivtv_init(void)
+int ivtv_init(const char *args)
 {
 	if(ivtv_verbose)
 		printf(IVTV_MSG"init\n");
-- 
cgit v1.2.3