Skip to content

Commit 07e10b8

Browse files
committed
another attempt to avoid "uninitialized value" warnings in nuvinfo
audio_bits_per_sample is not ID_AUDIO_BITRATE -- just default to 16 for now. update timestamps.
1 parent 69ec582 commit 07e10b8

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

trunk/mythtv/nuvinfo.pm

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/usr/bin/perl -w
2-
#Last Updated: 2005.02.11 (xris)
2+
#
3+
# $Date$
4+
# $Revision$
5+
# $Author$
36
#
47
# mythtv::nuvinfo.pm
58
#
@@ -131,7 +134,9 @@ package mythtv::nuvinfo;
131134
($info{'height'}) = $data =~ m/^ID_VIDEO_HEIGHT=(\d+)/m;
132135
($info{'fps'}) = $data =~ m/^ID_VIDEO_FPS=(\d+(?:\.\d*)?)/m;
133136
($info{'audio_sample_rate'}) = $data =~ m/^ID_AUDIO_RATE=(\d+)/m;
134-
($info{'audio_bits_per_sample'}) = $data =~ m/^ID_AUDIO_BITRATE=(\d+)/m;
137+
# this is a different kind of "bits" than transcode and other programs expect
138+
#($info{'audio_bits_per_sample'}) = $data =~ m/^ID_AUDIO_BITRATE=(\d+)/m;
139+
$info{'audio_bits_per_sample'} = 16;
135140
($info{'audio_channels'}) = $data =~ m/^ID_AUDIO_NCH=(\d+)/m;
136141
($info{'mpeg_stream_type'}) = $data =~ m/^ID_VIDEO_FPS=(\d+(?:\.\d*)?)/m;
137142
($info{'aspect'}) = $data =~ m/^ID_VIDEO_ASPECT=(\d+(?:[\.\,]\d*)?)/m;

trunk/nuvexport

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Last Updated: 2005.02.28 (xris)
33

44
# Version
5-
$VERSION = '0.2 0.20050428.cvs';
5+
$VERSION = '0.2 0.20050511.cvs';
66

77
# Autoflush buffers
88
$|++;

trunk/nuvexport.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name: nuvexport
66
Version: 0.2
7-
Release: 0.20050428.cvs
7+
Release: 0.20050511.cvs
88
License: GPL
99
Summary: mythtv nuv video file conversion script
1010
URL: http://forevermore.net/nuvexport/

trunk/nuvinfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# Print the info
2020
print "\ninfo for: $file\n\n";
2121
foreach $key (sort keys %info) {
22-
next unless defined $info{$key};
22+
next unless ($key && defined $info{$key});
2323
print ' ' x (23 - length($key)) if (length($key) < 23);
2424
print "$key: $info{$key}\n";
2525
}

0 commit comments

Comments
 (0)