diff -r -u -b zenphoto/themes/stopdesign/image.php zenphoto-2/themes/stopdesign/image.php
--- zenphoto/themes/stopdesign/image.php	2008-02-25 22:23:45.000000000 -0800
+++ zenphoto-2/themes/stopdesign/image.php	2008-03-15 18:53:46.000000000 -0700
@@ -64,8 +70,9 @@
 				<?php 
 					if (getImageEXIFData()) {echo "<a href=\"#TB_inline?height=345&width=300&inlineId=imagemetadata\" title=\"Image Info\" class=\"thickbox\">Image Info</a>";
 						printImageMetadata('', false); 
+						echo " / ";
 					} 
-				?> / <a href="<?php echo getFullImageURL();?>" title="<?php echo getImageTitle();?>">Full Size</a>
+				?> <a href="<?php echo getFullImageOrVideoURL();?>" title="<?php echo getImageTitle();?>">Full Size</a>
  					</li>
 				</ul>
 			</div>
diff -r -u -b zenphoto/zp-core/functions.php zenphoto-2/zp-core/functions.php
--- zenphoto/zp-core/functions.php	2008-02-29 12:46:00.000000000 -0800
+++ zenphoto-2/zp-core/functions.php	2008-03-07 20:33:45.000000000 -0800
@@ -313,6 +313,28 @@
 }
 
 /**
+ * Search for a high quality version of the video
+ *
+ * @param string $album folder path of the album
+ * @param string $video name of the target
+ * @return string
+ */
+function checkVideoOriginal($album,$video){
+        $extTab = array(".flv",".3gp",".mov",".FLV",".3GP",".MOV");
+	foreach($extTab as $ext) {
+	        $video = str_replace($ext,"",$video);
+	}
+	$extTab = array(".ogg",".OGG",".avi",".AVI",".wmv",".WMV");
+
+	foreach($extTab as $ext) {
+	        if(file_exists($album."/".$video.$ext)) {
+                        return $video.$ext;
+		}
+        }
+        return NULL;
+}														      
+
+/**
  * Returns a truncated string
  *
  * @param string $string souirce string
diff -r -u -b zenphoto/zp-core/template-functions.php zenphoto-2/zp-core/template-functions.php
--- zenphoto/zp-core/template-functions.php	2008-02-28 13:19:14.000000000 -0800
+++ zenphoto-2/zp-core/template-functions.php	2008-03-07 20:33:42.000000000 -0800
@@ -1935,6 +1937,22 @@
 	}
 }
 /**
+ * Return the url to the original image.
+ * If it's a video, check to see if a high quality avi or ogg
+ * version is available
+ *
+ * @return string
+ */
+function getFullImageOrVideoURL() {
+	global $_zp_current_image;
+	$url = getFullImageURL();
+	
+        $album = getAlbumFolder();
+	$original = checkVideoOriginal($album . $_zp_current_image->getAlbum()->getFolder(), $_zp_current_image->getFileName());
+	if ($original) return getAlbumFolder(WEBPATH) .  $_zp_current_image->getAlbum()->getFolder() . "/" .$original;
+	return $url;
+}
+/**
  * Returns the "raw" url to the image in the albums folder
  *
  * @return string