--- ffmpeg/libavformat/mov.c~	2010-12-06 20:38:26.000000000 -0500
+++ ffmpeg/libavformat/mov.c	2012-01-09 11:31:22.746694487 -0500
@@ -1746,7 +1746,11 @@ 
         return 0;
     }
 
-    if (!sc->time_scale) {
+    if (sc->time_offset <= 0)
+        sc->time_offset = 1;
+    if (c->time_scale <= 0)
+        c->time_scale = 1;
+    if (sc->time_scale <= 0) {
         av_log(c->fc, AV_LOG_WARNING, "stream %d, timescale not set\n", st->index);
         sc->time_scale = c->time_scale;
         if (!sc->time_scale)