Index: ffmpeg_wrapper.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ffmpeg_wrapper/ffmpeg_wrapper.module,v
retrieving revision 1.1.2.20.2.41
diff -u -p -r1.1.2.20.2.41 ffmpeg_wrapper.module
--- ffmpeg_wrapper.module	22 Mar 2010 00:11:23 -0000	1.1.2.20.2.41
+++ ffmpeg_wrapper.module	20 Sep 2010 20:29:43 -0000
@@ -423,7 +423,7 @@ function ffmpeg_wrapper_get_codecs($retu
     // we know where the codecs are by looking at the output of ffmpeg -formats or ffmpeg -codecs
     // depending of version SVN-r > 20561 or version > 0.5
     $ffmpeg_version = ffmpeg_wrapper_get_version('svn');
-    if ( ((int)$ffmpeg_version >= 20561) || ((float)$ffmpeg_version > 0.5)  ) {
+    if ( ((int)$ffmpeg_version >= 20561) || ((int)$ffmpeg_version < 1000 && (float)$ffmpeg_version > 0.5) ) {
       $output = ffmpeg_wrapper_run_command('-codecs');
       $codecs_formats_pos = strpos($output, 'Codecs:');
       $codecs_formats_pos_end = strpos($output, 'Note,');
@@ -618,7 +618,7 @@ function ffmpeg_wrapper_get_file_formats
     $startpos = strpos($formats, 'File formats:');
     // depending of version SVN-r > 20561 or version > 0.5 string changes
     $ffmpeg_version = ffmpeg_wrapper_get_version('svn');
-    if ( ((int)$ffmpeg_version >= 20561) || ((float)$ffmpeg_version > 0.5)  ) {
+    if ( ((int)$ffmpeg_version >= 20561) || ((int)$ffmpeg_version < 1000 && (float)$ffmpeg_version > 0.5)  ) {
       $endpos = strpos($formats, 'FFmpeg version');
     }
     else {
@@ -709,6 +709,10 @@ function ffmpeg_wrapper_get_version($for
   if ($format == 'version') {
     return $version_number;
   }
+  // Return SVN revision number format used by Debian lenny.
+  if (preg_match('/^r([0-9]+)\+/', $version_number, $matches)) {
+    return $matches[1];
+  }
   // is FALSE if the string is not found
   if (strpos($version_number, 'SVN-r') == 0) {
     $version_release = substr($version_number, 5);
@@ -1348,4 +1352,4 @@ function ffmpeg_wrapper_configuration_fo
   );
 
   return $form;
-}
\ No newline at end of file
+}