diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2010-04-11 08:12:31 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2010-04-11 08:12:31 (GMT) |
| commit | a890cdaf65cc0dbccc39ef0117674b92f12d967f (patch) | |
| tree | f911bead1de193cd8470e838d360dae2db3098d0 /abs/core-testing/mythtv/old/stable-0.22/mythtv/changeset_r23616.patch | |
| parent | f3826493d0230020fd1dae2d30429cd06eac6a2f (diff) | |
| download | linhes_pkgbuild-a890cdaf65cc0dbccc39ef0117674b92f12d967f.zip linhes_pkgbuild-a890cdaf65cc0dbccc39ef0117674b92f12d967f.tar.gz linhes_pkgbuild-a890cdaf65cc0dbccc39ef0117674b92f12d967f.tar.bz2 | |
MythTV:packaged for mythtv 0.23 and plugins.
Diffstat (limited to 'abs/core-testing/mythtv/old/stable-0.22/mythtv/changeset_r23616.patch')
| -rw-r--r-- | abs/core-testing/mythtv/old/stable-0.22/mythtv/changeset_r23616.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/abs/core-testing/mythtv/old/stable-0.22/mythtv/changeset_r23616.patch b/abs/core-testing/mythtv/old/stable-0.22/mythtv/changeset_r23616.patch new file mode 100644 index 0000000..2af779a --- /dev/null +++ b/abs/core-testing/mythtv/old/stable-0.22/mythtv/changeset_r23616.patch @@ -0,0 +1,38 @@ +--- bindings/perl/MythTV/Recording.pm.orig 2010-03-23 23:06:08.000000000 +0000 ++++ bindings/perl/MythTV/Recording.pm 2010-03-23 23:15:24.000000000 +0000 +@@ -307,12 +307,12 @@ + # Set the is_mpeg flag + $info{'is_mpeg'} = 1; + # Grab the info we want from mplayer (go uber-verbose to override --really-quiet) +- my $data = `$program -v -v -v -v -nolirc -nojoystick -vo null -ao null -frames 1 -identify '$file' 2>/dev/null`; ++ my $idargs = "-v -v -v -v -nolirc -nojoystick -vo null -ao null -frames 1 -identify"; ++ my $data = `$program $idargs '$file' 2>/dev/null`; + study $data; +- ($info{'video_type'}) = $data =~ m/^VIDEO:\s*(MPEG[12])/m; ++ ($info{'video_type'}) = $data =~ m/^VIDEO:?\s*(MPEG[12]|H264)/m; + ($info{'width'}) = $data =~ m/^ID_VIDEO_WIDTH=0*([1-9]\d*)/m; + ($info{'height'}) = $data =~ m/^ID_VIDEO_HEIGHT=0*([1-9]\d*)/m; +- ($info{'fps'}) = $data =~ m/^ID_VIDEO_FPS=0*([1-9]\d*(?:\.\d+)?)/m; + ($info{'audio_sample_rate'}) = $data =~ m/^ID_AUDIO_RATE=0*([1-9]\d*)/m; + ($info{'audio_bitrate'}) = $data =~ m/^ID_AUDIO_BITRATE=0*([1-9]\d*)/m; + ($info{'audio_bits_per_sample'}) = $data =~ m/^AUDIO:.+?ch,\s*[su](8|16)/mi; +@@ -321,6 +321,19 @@ + ($info{'aspect'}) = $data =~ m/^ID_VIDEO_ASPECT=0*([1-9]\d*(?:[\.\,]\d+)?)/m; + ($info{'audio_type'}) = $data =~ m/^ID_AUDIO_CODEC=0*([1-9]\d*(?:\.\d+)?)/m; + ($info{'mpeg_stream_type'}) = $data =~ m/^ID_DEMUXER=(\w+)/mi; ++ # Mplayer can't find the needed details. Let's try again, forcing the use ++ # of the ffmpeg lavf demuxer ++ if (!defined($info{'width'})) { ++ my $altdata = `$program $idargs -demuxer lavf '$file' 2>/dev/null`; ++ study $altdata; ++ ($info{'width'}) = $altdata =~ m/^ID_VIDEO_WIDTH=0*([1-9]\d*)/m; ++ ($info{'height'}) = $altdata =~ m/^ID_VIDEO_HEIGHT=0*([1-9]\d*)/m; ++ ($info{'audio_bitrate'}) = $altdata =~ m/^ID_AUDIO_BITRATE=0*([1-9]\d*)/m; ++ ($info{'audio_sample_rate'}) = $altdata =~ m/^ID_AUDIO_RATE=0*([1-9]\d*)/m; ++ ($info{'audio_channels'}) = $altdata =~ m/^ID_AUDIO_NCH=0*([1-9]\d*)/m; ++ ($info{'aspect'}) = $altdata =~ m/^ID_VIDEO_ASPECT=0*([1-9]\d*(?:[\.\,]\d+)?)/m; ++ } ++ + # Stream type + $info{'mpeg_stream_type'} = lc($info{'mpeg_stream_type'}); + if ($info{'mpeg_stream_type'} && $info{'mpeg_stream_type'} !~ /^mpeg/) { |