--- home/jonne/Desktop/video_filter/sites/youtube.inc 
+++ var/www/xxx/modules/video_filter/sites/youtube.inc 
@@ -19,8 +19,8 @@
 			}
 		}
 	}
-	
-	$video['source'] = strstr($video['source'], '?v=') ? substr($video['source'], strpos($video['source'], '?v=') + 3, strpos($video['source'], '&')) : $video['source'];
+	$ampersandPos = strpos($video['source'], '&')>0?strpos($video['source'], '&'):strlen($video['source']);
+	$video['source'] = strstr($video['source'], '?v=') ? substr($video['source'], strpos($video['source'], '?v=') + 3, $ampersandPos) : $video['source'];
 
 	if ($video['autoplay']) {
 		$output = '<embed src="http://www.youtube.com/v/'.$video['source'].'&rel=1&autoplay=1" type="application/x-shockwave-flash" wmode="transparent" width="'.$video['width'].'" height="'.$video['height'].'"></embed>';