Ticket #4438: xvid-mp3flagfix.patch

nuvexport/export/ffmpeg/ASF.pm

@@ -49 +49 @@
         if (!$self->can_encode('msmpeg4')) {
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to msmpeg4.";
         }
-        if (!$self->can_encode('mp3')) {
+        if (!$self->can_encode('mp3') && !$self->can_encode('libmp3lame')) {
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to mp3 audio.";
         }
     # Any errors?  disable this function
@@ -145 +145 @@
                                    . ' -minrate 32 -maxrate '.(2*$self->{'v_bitrate'}).' -bt 32'
                                    . ' -bufsize 65535'
 #                                   . ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.7'
-                                   . ' -acodec mp3'
+                                   . ' -acodec libmp3lame'
                                    .$self->param('ab', $self->{'a_bitrate'})
                                    . " -pass 2 -passlogfile '/tmp/asf.$$.log'"
                                    . ' -f asf';
@@ -162 +162 @@
                                       : '')
 #                                   . ' -lumi_mask 0.05 -dark_mask 0.02'
 #                                   . ' -scplx_mask 0.7'
-                                   . ' -acodec mp3'
+                                   . ' -acodec libmp3lame'
                                    .$self->param('ab', $self->{'a_bitrate'})
                                    . ' -f asf';
         }

nuvexport/export/ffmpeg/DivX.pm

@@ -49 +49 @@
         if (!$self->can_encode('mpeg4')) {
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to mpeg4.";
         }
-        if (!$self->can_encode('mp3')) {
+        if (!$self->can_encode('mp3') && !$self->can_encode('libmp3lame')) {
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to mp3 audio.";
         }
     # Any errors?  disable this function
@@ -157 +157 @@
                                    . ' -mv4'
                                    . ' -part'
                                    . ' -vtag divx'
-                                   . ' -acodec mp3'
+                                   . ' -acodec libmp3lame'
                                    .$self->param('ab', $self->{'a_bitrate'})
                                    . " -pass 2 -passlogfile '/tmp/divx.$$.log'"
                                    . ' -f avi';
@@ -178 +178 @@
                                    . ' -mv4'
                                    . ' -part'
                                    . ' -vtag divx'
-                                   . ' -acodec mp3'
+                                   . ' -acodec libmp3lame'
                                    .$self->param('ab', $self->{'a_bitrate'})
                                    . ' -f avi';
         }

nuvexport/export/ffmpeg/XviD.pm

@@ -60 +60 @@
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to xvid.\n"
                                       ."  (It must be compiled with the --enable-libxvid option)";
         }
-        if (!$self->can_encode('mp3')) {
+        if (!$self->can_encode('mp3') && !$self->can_encode('libmp3lame')) {
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to mp3 audio.";
         }
 
@@ -182 +182 @@
                                       : '');
         }
     # Don't forget the audio, etc.
-        $self->{'ffmpeg_xtra'} .= ' -acodec mp3 -async 1'
+        $self->{'ffmpeg_xtra'} .= ' -acodec libmp3lame -async 1'
                                  .$self->param('ab', $self->{'a_bitrate'})
                                  .' -f avi';
     # Execute the (final pass) encode

nuvexport/export/ffmpeg/MP3.pm

@@ -45 +45 @@
             or push @{$self->{'errors'}}, 'You need id3tag to export an mp3.';
 
     # Can we even encode vcd?
-        if (!$self->can_encode('mp3')) {
+        if (!$self->can_encode('mp3') && !$self->can_encode('libmp3lame')) {
             push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to mp3 audio.";
         }
     # Any errors?  disable this function
@@ -79 +79 @@
         my $episode = shift;
     # Build the ffmpeg string
         $self->{'ffmpeg_xtra'} = $self->param('ab', $self->val('bitrate'))
-                                .' -acodec mp3 -f mp3';
+                                .' -acodec libmp3lame -f mp3';
     # Execute ffmpeg
         $self->SUPER::export($episode, '.mp3');
     # Now tag it