diff --git a/trunk/export/transcode.pm b/trunk/export/transcode.pm index 93580f9..b460352 100644 --- a/trunk/export/transcode.pm +++ b/trunk/export/transcode.pm @@ -22,8 +22,9 @@ package export::transcode; use mythtv::recordings; # Load the following extra parameters from the commandline - add_arg('zoom_filter:s', 'Which zoom filter to use.'); - add_arg('force_mythtranscode!', 'Force use of mythtranscode, even on mpeg files.'); + add_arg('zoom_filter:s', 'Which zoom filter to use.'); + add_arg('force_mythtranscode!', 'Force use of mythtranscode, even on mpeg files.'); + add_arg('mythtranscode_cutlist!', "Force use of mythtranscode's cutlist instead of transcode's internal one (only works with --force_mythtranscode)."); # Check for transcode sub init_transcode { @@ -221,7 +222,9 @@ package export::transcode; # On no-audio encodes, we need to do something to keep mythtranscode's audio buffers from filling up available RAM # $mythtranscode .= ' --fifosync' if ($skip_audio); # let transcode handle the cutlist -- got too annoyed with the first/last frame(s) showing up no matter what I told mythtranscode - #$mythtranscode .= ' --honorcutlist' if ($self->{'use_cutlist'}); + if ($self->val('use_cutlist') && $self->val('mythtranscode_cutlist')) { + $mythtranscode .= ' --honorcutlist'; + } # Figure out the input files $transcode .= " -i /tmp/fifodir_$$/vidout -p /tmp/fifodir_$$/audout" .' -H 0 -x raw' @@ -251,7 +254,8 @@ package export::transcode; $transcode .= " -j $h,$w,$h,$w" if ($h || $w); } # Use the cutlist? (only for mpeg files -- nuv files are handled by mythtranscode) - if ($self->{'use_cutlist'} && $episode->{'cutlist'} && $episode->{'cutlist'} =~ /\d/) { + if ($self->{'use_cutlist'} && !$self->val('mythtranscode_cutlist') + && $episode->{'cutlist'} && $episode->{'cutlist'} =~ /\d/) { my $cutlist = $episode->{'cutlist'}; $cutlist =~ tr/ //d; $cutlist =~ tr/\n/ /; diff --git a/trunk/nuvexport b/trunk/nuvexport index fe1cae9..cce37b1 100755 --- a/trunk/nuvexport +++ b/trunk/nuvexport @@ -5,7 +5,7 @@ # $Author$ # Version - $VERSION = '0.2 0.20050919.svn'; + $VERSION = '0.2 0.20051019.svn'; # Autoflush buffers $|++; diff --git a/trunk/nuvexport.spec b/trunk/nuvexport.spec index 71913ed..5cde048 100644 --- a/trunk/nuvexport.spec +++ b/trunk/nuvexport.spec @@ -4,7 +4,7 @@ Name: nuvexport Version: 0.2 -Release: 0.20050919.svn +Release: 0.20051019.svn License: GPL Summary: mythtv nuv video file conversion script URL: http://forevermore.net/nuvexport/ diff --git a/trunk/nuvexportrc b/trunk/nuvexportrc index 39a7348..9608200 100644 --- a/trunk/nuvexportrc +++ b/trunk/nuvexportrc @@ -141,10 +141,20 @@ # Setting always_use_mythtranscode to yes will force nuvexport to call # mythtranscode when using the transcode exporter. This may help problems # that some people have been having with transcode not recognizing certain -# dvb recordings. +# dvb recordings, as well as transcode not working properly on certain ivtv +# recordings. # # force_mythtranscode=no +# +# Setting both force_mythtranscode and mythtranscode_cutlist to yes will tell +# nuvexport to use mythtranscode's built-in cutlist functions, rather than +# having transcode use its own. I've found that the cutlists for a handful +# of ivtv recordings that do not work properly with transcode's internal +# cutlist handler. +# +# mythtranscode_cutlist=no +