Ticket #3809: nuvexport-ffmpeg_xvid_rename.patch

export/ffmpeg/XviD.pm

@@ -57 +57 @@
         $self->init_ffmpeg();
 
     # Can we even encode xvid?
-        if (!$self->can_encode('xvid')) {
+        if ($self->can_encode('libxvid')) {
+                $self->{'xvid_name'} = "libxvid";
+
+        } elsif ($self->can_encode('xvid')) {
+                $self->{'xvid_name'} = "xvid";
+
+        } else {
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to xvid.\n"
-                                      ."  (It must be compiled with the --enable-xvid option)";
-        }
+                                      ."  (It must be compiled with the --enable-xvid or --enable-libxvid option)";
+        }
         if (!$self->can_encode('mp3')) {
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to mp3 audio.";
         }
@@ -141 +147 @@
         }
         my $safe_title = shell_escape($safe_title);
     # Build the common ffmpeg string
-        my $ffmpeg_xtra  = ' -vcodec xvid'
+        my $ffmpeg_xtra  = ' -vcodec '. $self->{'xvid_name'}
                           .$self->param('bit_rate', $self->{'v_bitrate'})
                           .($self->{'vbr'}
                             ? $self->param('rc_min_rate', 32)