Index: conf.c
===================================================================
--- conf.c	(revisión: 292)
+++ conf.c	(copia de trabajo)
@@ -678,7 +678,8 @@
 	"# it requires no installation of codec on the Windows client.\n"
 	"# swf - gives you a flash film with extension .swf\n"
 	"# flv - gives you a flash video with extension .flv\n"
-	"# ffv1 - FF video codec 1 for Lossless Encoding ( experimental )",
+	"# ffv1 - FF video codec 1 for Lossless Encoding ( experimental )\n"
+	"# mov - QuickTime ( testing )",
 	0,
 	CONF_OFFSET(ffmpeg_video_codec),
 	copy_string,
Index: motion-dist.conf.in
===================================================================
--- motion-dist.conf.in	(revisión: 292)
+++ motion-dist.conf.in	(copia de trabajo)
@@ -275,6 +275,7 @@
 # swf - gives you a flash film with extension .swf
 # flv - gives you a flash video with extension .flv
 # ffv1 - FF video codec 1 for Lossless Encoding ( experimental )
+# mov - QuickTime ( testing )
 ffmpeg_video_codec mpeg4
 
 # Use ffmpeg to deinterlace video. Necessary if you use an analog camera
Index: ffmpeg.c
===================================================================
--- ffmpeg.c	(revisión: 292)
+++ ffmpeg.c	(copia de trabajo)
@@ -271,7 +271,10 @@
 			/* Use the FFMPEG Lossless Video codec (experimental!).
 			   Requires strict_std_compliance to be <= -2 */
 			of->video_codec = CODEC_ID_FLV1;
-		}		
+		}
+	} else if (strcmp(codec, "mov") == 0) {
+		ext = ".mov";
+		of = guess_format("mov", NULL, NULL);		
 	} else {
 		motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec);
 		return NULL;
Index: CHANGELOG
===================================================================
--- CHANGELOG	(revisión: 292)
+++ CHANGELOG	(copia de trabajo)
@@ -23,6 +23,7 @@
    * Motion start if a camera isn't there at start, retries to connect if lost (Dag Erlandsson)
    * Netcam Keepalive and HTTP/1.1 http://www.lavrsen.dk/twiki/bin/view/Motion/FeatureRequest2007x01x22x231542 
     (Simon Walls)
+   * Added mov , Quicktime file format (Andrew Hamilton).
 
 Bugfixes
    * Fixed a problem with locate and fixed mask overlay (Dag Erlandsson).
Index: CREDITS
===================================================================
--- CREDITS	(revisión: 292)
+++ CREDITS	(copia de trabajo)
@@ -472,6 +472,7 @@
      http://www.lavrsen.dk/twiki/bin/view/Motion/MotionffmpegDeinterlace 
    * Added FFV1 ( FF video codec 1 ) codec , Lossless encoding
      http://www.lavrsen.dk/twiki/bin/view/Motion/LosslessEncoding 
+   * Added mov , Quicktime file format (Andrew Hamilton).
 
 Peter Holik
    * Netcam First Header patch. If an error with jpeg decompression occured at