Index: acidfree.module
===================================================================
--- acidfree.module	(revision 335)
+++ acidfree.module	(working copy)
@@ -1460,7 +1460,7 @@
             }
         }
         if (!isset($node->class)) {
-            drupal_set_message(t('file %filename is not a valid acidfree element type (%mime)', Array('%filename' => $file->filename, '%mime'=>$mime)), 'error');
+            drupal_set_message(t('file %filename is not a valid acidfree element type (%mime)', Array('%filename' => $file->filename, '%mime'=>$file->filemime)), 'error');
             return false;
         }
         $node->title = acidfree_title_from_file($file->filename);
Index: class_video.inc
===================================================================
--- class_video.inc	(revision 335)
+++ class_video.inc	(working copy)
@@ -57,6 +57,10 @@
     global $acidfree_types;
     $mime = 'image/jpeg';
     $ext = 'jpg';
+    
+    $node->width = isset($node->width)?$node->width:variable_get('acidfree_default_video_width', 320);
+    $node->height = isset($node->height)?$node->height:variable_get('acidfree_default_video_height', 240);
+    
     $node->thumb = acidfree_add_file($node, acidfree_mktmpfile('videosmall'), "{$node->nid}_thumb.{$ext}", $mime, true);
     $method = variable_get('acidfree_video_thumbnailer', 'none');
     $tfile = file_check_upload('userthumb');
@@ -153,12 +157,12 @@
             $form['width'] = array(
                     '#type' => 'textfield',
                     '#title' => t('Video width'),
-                    '#default_value' => 320,
+                    '#default_value' => variable_get('acidfree_default_video_width', 320),
                 );
             $form['height'] = array(
                     '#type' => 'textfield',
                     '#title' => t('Video height'),
-                    '#default_value' => 240,
+                    '#default_value' => variable_get('acidfree_default_video_height', 240),
                 );
             break;
         case 'user':
@@ -221,7 +225,20 @@
             '#default_value' => $value,
             '#options' => $options,
         );
-    if ($value == 'mplayer') {
+    if ($value == 'none') {
+        $form['video_manip']['acidfree_default_video_width'] = array(
+                '#type' => 'textfield',
+                '#title' => t('Default width'),
+                '#default_value' => variable_get('acidfree_default_video_width', 320),
+                '#description' => t('Default video width')
+            );
+        $form['video_manip']['acidfree_default_video_height'] = array(
+                '#type' => 'textfield',
+                '#title' => t('Default height'),
+                '#default_value' => variable_get('acidfree_default_video_height', 240),
+                '#description' => t('Default video height')
+            );            
+    } else if ($value == 'mplayer') {
         $name = 'acidfree_path_to_mplayer';
         $mplayer_path = variable_get($name, '/usr/bin/mplayer');
         $form['video_manip'][$name] = array(