/[drupal]/contributions/modules/media_mover/mm_ffmpeg/mm_ffmpeg.module
ViewVC logotype

Diff of /contributions/modules/media_mover/mm_ffmpeg/mm_ffmpeg.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1.2.60.2.11, Mon Mar 2 18:01:18 2009 UTC revision 1.1.2.60.2.12, Wed Apr 1 02:56:53 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2    
3  /* $Id: mm_ffmpeg.module,v 1.1.2.60.2.10 2008/12/11 03:36:39 arthuregg Exp $ */  /* $Id: mm_ffmpeg.module,v 1.1.2.60.2.11 2009/03/02 18:01:18 arthuregg Exp $ */
4    
5    
6  /*  /*
# Line 277  function mm_ffmpeg_video(&$file, $config Line 277  function mm_ffmpeg_video(&$file, $config
277    media_mover_api_set_file_perm($output_file);    media_mover_api_set_file_perm($output_file);
278    
279    // can we get the mime type for this?    // can we get the mime type for this?
280    if (function_exists('mimedetect_mime')) {    $file['data']['file']['mime'] = file_get_mimetype($output_file);
281      $mime = mimedetect_mime($output_file);  
282      $file['data']['file']['mime'] = $mime;    // get any meta data for this file
283    }    $file['data']['meta'] = ffmpeg_wrapper_file_data($output_file);
284    
285    // return the completed file    // return the completed file
286    return $output_file;    return $output_file;
Legend:
Removed from v.1.1.2.60.2.11  
changed lines
  Added in v.1.1.2.60.2.12
  ViewVC Help
Powered by ViewVC 1.1.2