Sophie

Sophie

distrib > Mageia > 4 > x86_64 > by-pkgid > 4ad1944e100f4837694d1e1da22e99b9 > files > 3

psimedia-1.0.3-12.mga4.src.rpm

https://bugs.gentoo.org/show_bug.cgi?id=361419#c5

--- gstprovider/devices.cpp	2009-06-09 10:12:11.000000000 +0200
+++ gstprovider/devices.cpp	2011-04-02 11:47:21.898041830 +0200
@@ -90,7 +90,6 @@ 
 		element_name == "alsasink" ||
 		element_name == "osssrc" ||
 		element_name == "osssink" ||
-		element_name == "v4lsrc" ||
 		element_name == "v4l2src" ||
 		element_name == "osxaudiosrc" ||
 		element_name == "osxaudiosink" ||
@@ -224,11 +223,6 @@ 
 		if(type == PDevice::VideoIn)
 			element_name = "osxvideosrc";
 	}
-	else if(driver == "v4l")
-	{
-		if(type == PDevice::VideoIn)
-			element_name = "v4lsrc";
-	}
 	else if(driver == "v4l2")
 	{
 		if(type == PDevice::VideoIn)
@@ -380,7 +374,7 @@ 
 			bool first = true;
 			foreach(const DeviceEnum::Item &i, list)
 			{
-				if(type == PDevice::VideoIn && (element_name == "v4lsrc" || element_name == "v4l2src"))
+				if(type == PDevice::VideoIn && element_name == "v4l2src")
 				{
 					if(!test_video(element_name, i.id))
 						continue;
@@ -444,7 +438,6 @@ 
 	else // PDevice::VideoIn
 	{
 		drivers
-		<< "v4l"
 		<< "v4l2"
 		<< "osxvideo"
 		<< "winks";
--- gstprovider/gstthread.cpp	2009-05-17 19:55:27.000000000 +0200
+++ gstprovider/gstthread.cpp	2011-04-02 11:48:28.581514484 +0200
@@ -235,7 +235,6 @@ 
 #elif defined(Q_OS_LINUX)
 			reqelem
 			<< "alsasrc" << "alsasink"
-			<< "v4lsrc"
 			<< "v4l2src";
 #elif defined(Q_OS_UNIX)
 			reqelem