[mythtv-commits] Ticket #9205: Modify Nuvexport ffmpeg.pm for ffmpeg 0.6

[MythTV]

#9205: Modify Nuvexport ffmpeg.pm for ffmpeg 0.6
--------------------------------------+-------------------------------------
     Reporter:  glennst.25@…          |       Owner:  xris   
         Type:  defect                |      Status:  new    
     Priority:  minor                 |   Milestone:  unknown
    Component:  Apps - Nuvexport      |     Version:  0.23.1 
     Severity:  medium                |    Keywords:         
Ticket locked:  0                     |  
--------------------------------------+-------------------------------------
 Quick patch of changes I made to Nuvexport's ffmpeg.pm to allow it to
 understand the new codecs/formats layout of ffmpeg-0.6 :


 --- /usr/share/nuvexport/export/ffmpeg.pm.orig  2010-01-20
 04:09:23.000000000 +0800
 +++ /usr/share/nuvexport/export/ffmpeg.pm       2010-11-11
 17:50:59.475620429 +0800
 @@ -75,6 +75,9 @@
              if ($data =~ m/ffmpeg\sversion\s0.5[\-,]/si) {
                  $self->{'ffmpeg_vers'} = '0.5';
              }
 +            elsif ($data =~ m/ffmpeg\sversion\s0.6[\-,]/si) {
 +                $self->{'ffmpeg_vers'} = '0.6';
 +            }
              elsif ($data =~ m/ffmpeg\sversion\sSVN-r(\d+),/si) {
                  $self->{'ffmpeg_vers'} = $1;
              }
 @@ -102,7 +105,11 @@
      # Audio only?
          $self->{'audioonly'} = $audioonly;
      # Gather the supported codecs
 -        $data         = `$ffmpeg -formats 2>&1`;
 +       if ($self->{'ffmpeg_vers'} > 0.5) {
 +            $data     = `( $ffmpeg -formats ; $ffmpeg -codecs) 2>&1`;
 +       } else {
 +            $data     = `$ffmpeg -formats 2>&1`;
 +       }
          my ($formats) = $data =~
 /(?:^|\n\s*)File\sformats:\s*\n(.+?\n)\s*\n/s;
          my ($codecs)  = $data =~ /(?:^|\n\s*)Codecs:\s*\n(.+?\n)\s*\n/s;
          if ($formats) {

-- 
Ticket URL: <http://svn.mythtv.org/trac/ticket/9205>
MythTV <http://www.mythtv.org/>
MythTV Media Center