Index: convert.conf =================================================================== --- convert.conf (revision 31729) +++ convert.conf (working copy) @@ -74,63 +74,63 @@ # specific combinations match before wildcards mp4 mp3 * * - # FB:{BITRATE=-B %B}T:{START=-j %s}U:{END=-e %u} + # FB:{BITRATE=-B %B -b %B}T:{START=-j %s}U:{END=-e %u} [faad] -q -w -f 1 $START$ $END$ $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE$ - - aac mp3 * * - # IFB:{BITRATE=-B %B} + # IFB:{BITRATE=-B %B -b %B} [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE$ - - sls mp3 * * - # FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # FB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [sls] $FILE$ - -s | [lame] --silent -q $QUALITY$ $RESAMPLE$ $BITRATE$ - - mov mp3 * * - # FRB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # FRB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [mov123] $FILE$ | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - - alc mp3 * * - # FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}T:{START=-j %s}U:{END=-e %u} + # FB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D}T:{START=-j %s}U:{END=-e %u} [faad] -q -w -f 1 $START$ $END$ $FILE$ | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - ogg mp3 * * - # IFB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # IFB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [sox] -q -t ogg $FILE$ -t wav - | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - wav mp3 * * - # IFB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # IFB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ $FILE$ - aif mp3 * * - # IFB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # IFB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ $FILE$ - flc mp3 * * - # FB:{BITRATE=-B %B}T:{START=--skip=%t}U:{END=--until=%v}D:{RESAMPLE=--resample %D} + # FB:{BITRATE=-B %B -b %B}T:{START=--skip=%t}U:{END=--until=%v}D:{RESAMPLE=--resample %D} [flac] -dcs $START$ $END$ -- $FILE$ | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - wma mp3 * * - # F:{PATH=%f}R:{PATH=%F}B:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # F:{PATH=%f}R:{PATH=%F}B:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [wmadec] -w $PATH$ | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - wmal mp3 * * - # F:{PATH=%f}R:{PATH=%F}B:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # F:{PATH=%f}R:{PATH=%F}B:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [wmadec] -w $PATH$ | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - wmap mp3 * * - # F:{PATH=%f}R:{PATH=%F}B:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # F:{PATH=%f}R:{PATH=%F}B:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [wmadec] -w $PATH$ | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - mpc mp3 * * - # IRB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # IRB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [mppdec] --silent --prev --gain 3 - - | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - ape mp3 * * - # FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # FB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [mac] $FILE$ - -d | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - wvp mp3 * * - # FB:{BITRATE=-B %B}T:{START=--skip=%t}U:{END=--until=%v}D:{RESAMPLE=--resample %D} + # FB:{BITRATE=-B %B -b %B}T:{START=--skip=%t}U:{END=--until=%v}D:{RESAMPLE=--resample %D} [wvunpack] $FILE$ -wq $START$ $END$ -o - | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - mp3 mp3 * * @@ -290,7 +290,7 @@ # special case for smart bitrates on mp3 input mp3 mp3 transcode * - # IFB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + # IFB:{BITRATE=-B %B -b %B}D:{RESAMPLE=--resample %D} [lame] --silent -q $QUALITY$ -v $BITRATE$ $RESAMPLE$ --mp3input $FILE$ - flc flc transcode *