Ticket #7912: ffmpeg_diff.txt

File ffmpeg_diff.txt, 934 bytes (added by anonymous, 10 years ago)
Line 
1Index: mythextras/nuvexport/export/ffmpeg.pm
2===================================================================
3--- mythextras/nuvexport/export/ffmpeg.pm       (revision 23139)
4+++ mythextras/nuvexport/export/ffmpeg.pm       (working copy)
5@@ -102,9 +102,12 @@
6     # Audio only?
7         $self->{'audioonly'} = $audioonly;
8     # Gather the supported codecs
9-        $data         = `$ffmpeg -formats 2>&1`;
10-        my ($formats) = $data =~ /(?:^|\n\s*)File\sformats:\s*\n(.+?\n)\s*\n/s;
11-        my ($codecs)  = $data =~ /(?:^|\n\s*)Codecs:\s*\n(.+?\n)\s*\n/s;
12+        $data                  = `$ffmpeg -formats 2>&1`;
13+        my ($dummy1, $formats) = split /File\sformats:\s*\n/, $data;
14+
15+        $data                  = `$ffmpeg -codecs 2>&1`;
16+        my ($dummy2, $codecs)  = split /Codecs:\s*\n/, $data;
17+
18         if ($formats) {
19             while ($formats =~ /^\s(..)\s(\S+)\b/mg) {
20                 $self->{'formats'}{$2} = $1;