--- video.module.orig	2008-03-16 06:39:14.000000000 -0500
+++ video.module	2008-11-11 21:43:34.000000000 -0600
@@ -650,6 +650,15 @@
     '#value' => $node->vtype
   );
 
+  // kjh: set an hidden field to store encoded fid
+  if ($node->serial_data && isset($node->serial_data['video_encoded_fid'])) {
+      $form['video_encoded_fid'] = 
+	  array(
+		'#type' => 'hidden',
+		'#value' => $node->serial_data['video_encoded_fid']
+		);
+  }
+
   $form['video'] = array('#type' => 'fieldset', '#title' => t('Video Information'), '#weight' => -19);
   
   if(!video_support_autoresolution($node)) { // this vtype doesn't support autoresolution
@@ -778,7 +787,11 @@
     return video_insert($node);
   }
   else {
-
+    // kjh: make sure to save the encoded_fid
+    if ($node->new_video_upload_file_fid == 0
+	&& $node->video_encoded_fid) {
+	$node->serial_data['video_encoded_fid'] = $node->video_encoded_fid;
+    }
     $node->serialized_data = serialize($node->serial_data); //Serialize the data for insertion into the database.
 
     return db_query("UPDATE {video} SET vidfile='%s', size=%d, videox=%d, videoy=%d, video_bitrate=%d, audio_bitrate=%d, audio_sampling_rate=%d, audio_channels='%s', playtime_seconds=%d, disable_multidownload=%d, download_folder='%s', use_play_folder=%d, custom_field_1='%s', custom_field_2='%s', custom_field_3='%s', custom_field_4='%s', custom_field_5='%s', custom_field_6='%s', serialized_data='%s' WHERE vid = %d",