Merge svn changes up to r27682

Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.

Conflicts:
	command.c
	mplayer.c

2 files changed, 4 insertions, 4 deletions

diff --git a/vidix/ivtv_vid.c b/vidix/ivtv_vid.c
index 15bf38d85c..d190894aa3 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, int force)
 {
 	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(const char *args)
 {
 	if(ivtv_verbose)
 		printf(IVTV_MSG"init\n");
diff --git a/vidix/pm2_vid.c b/vidix/pm2_vid.c
index 748a9fd884..246bc7398d 100644
--- a/vidix/pm2_vid.c
+++ b/vidix/pm2_vid.c
@@ -92,7 +92,7 @@ static int find_chip(unsigned int vendor, uint32_t chip_id)
     return -1;
 }
 
-static int pm2_probe(int verbose, int force __attribute__ ((unused)))
+static int pm2_probe(int verbose, int force)
 {
     pciinfo_t lst[MAX_PCI_DEVICES];
     unsigned i,num_pci;