--- uploadfield.module	Thu Apr  1 16:42:48 2010
+++ uploadfield.module.new	Thu Apr  1 15:30:20 2010
@@ -519,7 +519,7 @@
       }
 
       // auto covnersion
-      if($field['widget']['autoconversion']) {
+      if($field['widget']['autoconversion'] && !$element['#value']['data']['bypass_autoconversion']) {
         video_auto_transcode_add_to_queue($element, $op);
       }
       break;