Update to 1.9.0:

mpeg2enc works "better".
some changes for the libquicktime.
maintainance for newer release of other packages the mjpegtools need.

7 files changed, 90 insertions, 510 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index cff289135c9..cce7ac220c5 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2008/07/14 12:56:09 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2009/01/08 17:21:36 wiz Exp $
 
-DISTNAME=	mjpegtools-1.8.0
-PKGREVISION=	6
+DISTNAME=	mjpegtools-1.9.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST
index 41434d6fc83..fd82e568704 100644
--- a/multimedia/mjpegtools/PLIST
+++ b/multimedia/mjpegtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/03/31 23:56:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/01/08 17:21:36 wiz Exp $
 bin/anytovcd.sh
 bin/jpeg2yuv
 bin/lav2avi.sh
@@ -9,6 +9,7 @@ bin/lavaddwav
 bin/lavinfo
 bin/lavpipe
 bin/lavplay
+bin/lavtc.sh
 bin/lavtrans
 bin/matteblend.flt
 bin/mjpeg_simd_helper
@@ -27,6 +28,7 @@ bin/y4mcolorbars
 bin/y4mdenoise
 bin/y4mhist
 bin/y4minterlace
+bin/y4mivtc
 bin/y4mshift
 bin/y4mspatialfilter
 bin/y4mstabilizer
@@ -60,14 +62,20 @@ include/mjpegtools/liblavplay.h
 include/mjpegtools/liblavrec.h
 include/mjpegtools/mjpeg_logging.h
 include/mjpegtools/mjpeg_types.h
+include/mjpegtools/motionsearch.h
 include/mjpegtools/mpeg2enc/elemstrmwriter.hh
 include/mjpegtools/mpeg2enc/encoderparams.hh
 include/mjpegtools/mpeg2enc/encodertypes.h
+include/mjpegtools/mpeg2enc/imageplanes.hh
 include/mjpegtools/mpeg2enc/macroblock.hh
 include/mjpegtools/mpeg2enc/mpeg2coder.hh
 include/mjpegtools/mpeg2enc/mpeg2encoder.hh
 include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
 include/mjpegtools/mpeg2enc/mpeg2encparams.h
+include/mjpegtools/mpeg2enc/mpeg2syntaxcodes.h
+include/mjpegtools/mpeg2enc/ontheflyratectl.hh
+include/mjpegtools/mpeg2enc/pass1ratectl.hh
+include/mjpegtools/mpeg2enc/pass2ratectl.hh
 include/mjpegtools/mpeg2enc/picture.hh
 include/mjpegtools/mpeg2enc/picturereader.hh
 include/mjpegtools/mpeg2enc/predict_ref.h
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index 998dd8b90dd..587a4a7fd19 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2006/10/13 12:51:27 tron Exp $
+$NetBSD: distinfo,v 1.16 2009/01/08 17:21:36 wiz Exp $
 
-SHA1 (mjpegtools-1.8.0.tar.gz) = e11d68298a64b52f98724dbf3fd14f168e140290
-RMD160 (mjpegtools-1.8.0.tar.gz) = 4d97a6a721f29223975605e2a5e645b4d7d129b5
-Size (mjpegtools-1.8.0.tar.gz) = 1475998 bytes
-SHA1 (patch-aa) = 3db2656a4d74b1ec1ac21b654c7a8ea33b791e19
+SHA1 (mjpegtools-1.9.0.tar.gz) = 1701233354c7ea86b5b7808c4dd5d03a71118e48
+RMD160 (mjpegtools-1.9.0.tar.gz) = 79e0eb4bce468bb8f12da336e29abe8fab390a5f
+Size (mjpegtools-1.9.0.tar.gz) = 1718063 bytes
+SHA1 (patch-aa) = 64c2bd92b206060fbaa95a932f0ea18aec17b127
 SHA1 (patch-ab) = 5fc460db1593afb1f99422003db86e6b7cfc8eb9
-SHA1 (patch-ac) = cffe8681628e3a9a45ca16fde0b71cedc5b3e65c
-SHA1 (patch-ad) = 285d7d036c5b6af89d72b6feddf48c6df2727a29
-SHA1 (patch-ae) = d13ec5a33a84187711001ab0edb9468256aa1ef2
+SHA1 (patch-ac) = e4d9e5bffc21199390cf248fd7cc9cfaa947ce0d
+SHA1 (patch-ad) = 2a6f33fdc9c240d1c5c1172710db7ed95b1fc5a8
+SHA1 (patch-ae) = 98bfbaccd8dc79582a32ffbc8dba7b6c039c0373
diff --git a/multimedia/mjpegtools/patches/patch-aa b/multimedia/mjpegtools/patches/patch-aa
index 75afe17dec7..61f7cc1e121 100644
--- a/multimedia/mjpegtools/patches/patch-aa
+++ b/multimedia/mjpegtools/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.6 2006/01/30 08:44:25 xtraeme Exp $
+$NetBSD: patch-aa,v 1.7 2009/01/08 17:21:36 wiz Exp $
 
---- configure.orig	2006-01-30 09:29:46.000000000 +0100
-+++ configure	2006-01-30 09:29:49.000000000 +0100
-@@ -27102,7 +27102,6 @@
- echo $ECHO_N "checking sub-architecture settings... $ECHO_C" >&6
+--- configure.orig	2009-01-06 07:49:27.000000000 +0100
++++ configure
+@@ -25986,7 +25986,6 @@ if test x$have_x86cpu = xtrue -o x$have_
+ echo $ECHO_N "checking sub-architecture settings... $ECHO_C" >&6; }
      if test x$have_x86cpu = xtrue; then
         host_mod_cpu=`echo $host_cpu | tr _ -`
 -       ARCHFLAGS="-march=$host_mod_cpu -mcpu=$host_mod_cpu"
diff --git a/multimedia/mjpegtools/patches/patch-ac b/multimedia/mjpegtools/patches/patch-ac
index d1c45aa7674..16f6656eef9 100644
--- a/multimedia/mjpegtools/patches/patch-ac
+++ b/multimedia/mjpegtools/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.4 2006/08/04 16:43:37 tron Exp $
+$NetBSD: patch-ac,v 1.5 2009/01/08 17:21:36 wiz Exp $
 
---- y4mdenoise/Region2D.hh.orig	2004-07-18 07:43:01.000000000 +0100
-+++ y4mdenoise/Region2D.hh	2006-08-04 17:42:07.000000000 +0100
+--- y4mdenoise/Region2D.hh.orig	2005-12-20 20:20:58.000000000 +0100
++++ y4mdenoise/Region2D.hh
 @@ -16,6 +16,7 @@
  
  #include "Status_t.h"
  #include <iostream>
 +#include <assert.h>
- 
+ #include <cassert>
  
  
diff --git a/multimedia/mjpegtools/patches/patch-ad b/multimedia/mjpegtools/patches/patch-ad
index eefeb84656d..447d0698d13 100644
--- a/multimedia/mjpegtools/patches/patch-ad
+++ b/multimedia/mjpegtools/patches/patch-ad
@@ -1,6 +1,8 @@
---- scripts/lav2mpeg.orig	2004-08-07 03:51:14.000000000 +0100
-+++ scripts/lav2mpeg	2006-10-13 13:23:51.000000000 +0100
-@@ -106,10 +106,10 @@
+$NetBSD: patch-ad,v 1.4 2009/01/08 17:21:36 wiz Exp $
+
+--- scripts/lav2mpeg.orig	2006-07-01 06:46:14.000000000 +0200
++++ scripts/lav2mpeg
+@@ -106,10 +106,10 @@ getTimeDiff() {
  }
  
  doStep() {
@@ -13,7 +15,7 @@
        eval ${step[$count]}
     fi
  }
-@@ -174,7 +174,7 @@
+@@ -174,7 +174,7 @@ printDebugInfo() {
     logIt "downscale=$downscaling"
  }
  
@@ -22,7 +24,7 @@
     usage;
     exit 1
  fi
-@@ -268,7 +268,7 @@
+@@ -268,7 +268,7 @@ logIt "$infostr"
  # lavinfo should set up video_frames, video_width
  # video_height, video_inter, video_norm, audio_chans
  eval $($LAVINFO $@ | grep "=")  # grep for = to remove Warnings
@@ -31,7 +33,7 @@
     logIt "'lavinfo $@' died! exiting"
     logIt " maybe you don't have lavinfo. or your input flags were wrong"
     logIt " input files must be the last input on the command line"
-@@ -348,7 +348,7 @@
+@@ -348,7 +348,7 @@ else
  fi
  
  # set up the audio
@@ -40,3 +42,12 @@
     stereo=${audio_chans:-0}
  else
     stereo=$userstereo
+@@ -401,7 +401,7 @@ if [ $video_width -gt $output_width -o $
+    fi
+ fi
+ 
+-if [ "$video_inter" == "1" ]; then
++if [ "$video_inter" = "1" ]; then
+    yuvdenoise_flags="$yuvdenoise_flags -F"
+ fi
+ 
diff --git a/multimedia/mjpegtools/patches/patch-ae b/multimedia/mjpegtools/patches/patch-ae
index d56ee72956f..1314adc467e 100644
--- a/multimedia/mjpegtools/patches/patch-ae
+++ b/multimedia/mjpegtools/patches/patch-ae
@@ -1,484 +1,46 @@
-$NetBSD: patch-ae,v 1.4 2006/10/13 12:51:27 tron Exp $
+$NetBSD: patch-ae,v 1.5 2009/01/08 17:21:36 wiz Exp $
 
---- scripts/anytovcd.sh.orig	2005-07-21 14:53:00.000000000 +0100
-+++ scripts/anytovcd.sh	2006-10-13 13:25:11.000000000 +0100
-@@ -313,7 +313,7 @@
-     esac
- done
- 
--if test "${VIDEO_SRC}" == "" || ! test -r "${VIDEO_SRC}"; then
-+if test "${VIDEO_SRC}" = "" || ! test -r "${VIDEO_SRC}"; then
- 
-     show_error "input file not specified or not present."
-     show_error "Use -h to get help."
-@@ -333,15 +333,15 @@
- VID_SIZE_SRC="`probe_vid_size "${VIDEO_SRC}"`"
- 
- # input interlacing
--if test "${INTERLACING}" == "none"; then
-+if test "${INTERLACING}" = "none"; then
- 
-     VID_ILACE_SRC="p"
- 
--elif test "${INTERLACING}" == "top_first"; then
-+elif test "${INTERLACING}" = "top_first"; then
- 
-     VID_ILACE_SRC="t"
- 
--elif test "${INTERLACING}" == "bottom_first"; then
-+elif test "${INTERLACING}" = "bottom_first"; then
- 
-     VID_ILACE_SRC="b"
- 
-@@ -352,15 +352,15 @@
- fi
- 
- # output interlacing
--if test "${INTERLACING_OUT}" == "none"; then
-+if test "${INTERLACING_OUT}" = "none"; then
- 
-     VID_ILACE_OUT="p"
- 
--elif test "${INTERLACING_OUT}" == "top_first"; then
-+elif test "${INTERLACING_OUT}" = "top_first"; then
- 
-     VID_ILACE_OUT="t"
- 
--elif test "${INTERLACING_OUT}" == "bottom_first"; then
-+elif test "${INTERLACING_OUT}" = "bottom_first"; then
- 
-     VID_ILACE_OUT="b"
- 
-@@ -371,14 +371,14 @@
- fi
- 
- # input framerate
--if test "${VID_FPS_SRC}" == ""; then
-+if test "${VID_FPS_SRC}" = ""; then
- 
-     VID_FPS_SRC="`probe_vid_fps "${VIDEO_SRC}"`"
- 
- fi
- 
- # input pixel/sample aspect ratio
--if test "${VID_SAR_SRC}" == ""; then
-+if test "${VID_SAR_SRC}" = ""; then
- 
-     if which ${TRANSCODE} >/dev/null; then
- 
-@@ -396,7 +396,7 @@
- VID_SAR_N_SRC="`echo ${VID_SAR_SRC} | cut -d: -f1`"
- VID_SAR_D_SRC="`echo ${VID_SAR_SRC} | cut -d: -f2`"
- 
--if test "${VID_SAR_N_SRC}" == "0" || test "${VID_SAR_D_SRC}" == "0"; then
-+if test "${VID_SAR_N_SRC}" = "0" || test "${VID_SAR_D_SRC}" = "0"; then
- 
-     show_warn "Unknown pixel aspect ratio, defaulting to 1:1"
-     VID_SAR_SRC="1:1"
-@@ -423,15 +423,15 @@
- fi
- 
- # quality presets
--if test "${QUALITY}" == "best"; then
-+if test "${QUALITY}" = "best"; then
- 
-     QUANT="4"
- 
--elif test "${QUALITY}" == "good"; then
-+elif test "${QUALITY}" = "good"; then
- 
-     QUANT="5"
- 
--elif test "${QUALITY}" == "fair"; then
-+elif test "${QUALITY}" = "fair"; then
- 
-     QUANT="6"
- 
-@@ -444,7 +444,7 @@
- fi
- 
- # profile(s)
--if test "${VCD_TYPE}" == "cvd"; then
-+if test "${VCD_TYPE}" = "cvd"; then
- 
-     FF_ENC="${FF_ENC} -vcodec mpeg2video -f rawvideo -bufsize 224"
-     MPEG2ENC="${MPEG2ENC} -f 8"
-@@ -468,7 +468,7 @@
-     # default volume size in mbytes (m = 1000)
-     VOL_SIZE="4700"
- 
--elif test "${VCD_TYPE}" == "cvd_wide"; then
-+elif test "${VCD_TYPE}" = "cvd_wide"; then
- 
-     FF_ENC="${FF_ENC} -vcodec mpeg2video -f rawvideo -bufsize 224"
-     MPEG2ENC="${MPEG2ENC} -f 8"
-@@ -490,7 +490,7 @@
-     
-     VOL_SIZE="4700"
- 
--elif test "${VCD_TYPE}" == "dvd"; then
-+elif test "${VCD_TYPE}" = "dvd"; then
- 
-     FF_ENC="${FF_ENC} -target dvd -f rawvideo -dc 10"
-     MPEG2ENC="${MPEG2ENC} -f 8 -D 10"
-@@ -513,7 +513,7 @@
-     
-     VOL_SIZE="4700"
- 
--elif test "${VCD_TYPE}" == "dvd_wide"; then
-+elif test "${VCD_TYPE}" = "dvd_wide"; then
- 
-     FF_ENC="${FF_ENC} -target dvd -f rawvideo -dc 10"
-     MPEG2ENC="${MPEG2ENC} -f 8 -D 10"
-@@ -536,7 +536,7 @@
-     
-     VOL_SIZE="4700"
- 
--elif test "${VCD_TYPE}" == "mvcd"; then
-+elif test "${VCD_TYPE}" = "mvcd"; then
- 
-     FF_ENC="${FF_ENC} -vcodec mpeg1video -f rawvideo -bufsize 40 -me_range 64"
-     MPEG2ENC="${MPEG2ENC} -f 2 -g 12 -G 24 -B 256 -S 797"
-@@ -562,7 +562,7 @@
-     # 360000 sectors * 2324 bytes per sector / 1000 / 1000
-     VOL_SIZE="836"
- 
--elif test "${VCD_TYPE}" == "svcd"; then
-+elif test "${VCD_TYPE}" = "svcd"; then
- 
-     FF_ENC="${FF_ENC} -target svcd -f rawvideo"
-     MPEG2ENC="${MPEG2ENC} -f 4 -B 256 -S 797"
-@@ -585,7 +585,7 @@
-     
-     VOL_SIZE="836"
- 
--elif test "${VCD_TYPE}" == "vcd"; then
-+elif test "${VCD_TYPE}" = "vcd"; then
- 
-     ENC_TYPE="cbr"
- 
-@@ -618,7 +618,7 @@
- fi
- 
- # audio pass-through
--if test "${ACOPY_MODE}" == "1"; then
-+if test "${ACOPY_MODE}" = "1"; then
- 
-     AUD_BITRATE_OUT="${AUD_BITRATE_SRC}"
-     AUD_FMT_OUT="${AUD_FMT_SRC}"
-@@ -632,12 +632,12 @@
- MPEG_OUT="${PREFIX_OUT}-%d.mpg"
- 
- # output interlacing
--if test "${VID_ILACE_OUT}" == "b"; then
-+if test "${VID_ILACE_OUT}" = "b"; then
- 
-     FF_ENC="${FF_ENC} -ildct -ilme -top 0"
-     MPEG2ENC="${MPEG2ENC} -I 1 -z b"
- 
--elif test "${VID_ILACE_OUT}" == "t"; then
-+elif test "${VID_ILACE_OUT}" = "t"; then
- 
-     FF_ENC="${FF_ENC} -ildct -ilme -top 1"
-     MPEG2ENC="${MPEG2ENC} -I 1 -z t"
-@@ -649,15 +649,15 @@
- fi
- 
- # output framerate
--if test "${VID_FPS_SRC}" == "30000:1001" || test "${VID_FPS_SRC}" == "24000:1001" || test "${VID_FPS_SRC}" == "25:1"; then
-+if test "${VID_FPS_SRC}" = "30000:1001" || test "${VID_FPS_SRC}" = "24000:1001" || test "${VID_FPS_SRC}" = "25:1"; then
- 
-     VID_FPS_OUT="${VID_FPS_SRC}"
- 
--elif test "${OUT_NORM}" == "ntsc"; then
-+elif test "${OUT_NORM}" = "ntsc"; then
- 
-     VID_FPS_OUT="30000:1001"
- 
--elif test "${OUT_NORM}" == "ntsc_film"; then
-+elif test "${OUT_NORM}" = "ntsc_film"; then
- 
-     VID_FPS_OUT="24000:1001"
- 
-@@ -668,7 +668,7 @@
- fi
- 
- # output sar and framesize for pal/ntsc
--if test "${VID_FPS_OUT}" == "25:1"; then
-+if test "${VID_FPS_OUT}" = "25:1"; then
- 
-     VID_SAR_OUT="${VID_SAR_625_OUT}"
-     VID_SIZE_OUT="${VID_SIZE_625_OUT}"
-@@ -681,7 +681,7 @@
- fi
- 
- # cvd_wide "preset" for y4mscaler
--if test "${VCD_TYPE}" == "cvd_wide"; then
-+if test "${VCD_TYPE}" = "cvd_wide"; then
- 
-     Y4MSCALER="${Y4MSCALER} -O sar=${VID_SAR_OUT} -O size=${VID_SIZE_OUT}"
- 
-@@ -695,12 +695,12 @@
- fi
- 
- # video decoder
--if test "${DEC_TOOL}" == "mpeg2dec"; then
-+if test "${DEC_TOOL}" = "mpeg2dec"; then
- 
-     test_bin ${MPEG2DEC}
-     DECODER="${MPEG2DEC} -s -o pgmpipe \"${VIDEO_SRC}\" | ${PGMTOY4M} |"
- 
--elif test "${DEC_TOOL}" == "ffmpeg"; then
-+elif test "${DEC_TOOL}" = "ffmpeg"; then
- 
-     test_bin ${FFMPEG}
-     DECODER="${FF_DEC} -y /dev/stdout | ${PGMTOY4M} |"
-@@ -714,7 +714,7 @@
- fi
- 
- # video framerate correction
--if test "${VID_FPS_SRC}" == "${VID_FPS_OUT}"; then
-+if test "${VID_FPS_SRC}" = "${VID_FPS_OUT}"; then
- 
-     FRC=""
- 
-@@ -726,14 +726,14 @@
- fi
- 
- # video "deinterlacer"
--if test "${VID_ILACE_SRC}" != "p" && test "${VID_ILACE_OUT}" == "p"; then
-+if test "${VID_ILACE_SRC}" != "p" && test "${VID_ILACE_OUT}" = "p"; then
- 
-     Y4MSCALER="${Y4MSCALER} -I ilace=top_only"
- 
- fi
- 
- # video scaler
--if test "${VID_SAR_SRC}" == "${VID_SAR_OUT}" && test "${VID_SIZE_SRC}" == "${VID_SIZE_OUT}"; then
-+if test "${VID_SAR_SRC}" = "${VID_SAR_OUT}" && test "${VID_SIZE_SRC}" = "${VID_SIZE_OUT}"; then
- 
-     SCALER=""
- 
-@@ -750,7 +750,7 @@
-     FILTER_TYPE="`echo ${FILTER} | awk -F: '{print $1}'`"
-     FILTER_LEVEL="`echo ${FILTER} | awk -F: '{print $2}'`"
-     
--    if test "${FILTER_LEVEL}" == ""; then
-+    if test "${FILTER_LEVEL}" = ""; then
- 
-         FILTER_LEVEL="light"
- 
-@@ -760,7 +760,7 @@
-     Y4MDENOISE_FLAGS="-v 0"
-     
-     # filter level
--    if test "${FILTER_LEVEL}" == "light"; then
-+    if test "${FILTER_LEVEL}" = "light"; then
- 
-         YUVMEDIANFILTER_FLAGS="-t 0"
-         YUVDENOISE_FLAGS="-l 1 -t 4 -S 0"
-@@ -771,7 +771,7 @@
-         Y4MDENOISE_FLAGS="${Y4MDENOISE_FLAGS} -t 1"
-         Y4MUNSHARP_FLAGS="-L 1.5,0.2,0"
- 
--    elif test "${FILTER_LEVEL}" == "medium"; then
-+    elif test "${FILTER_LEVEL}" = "medium"; then
- 
-         YUVMEDIANFILTER_FLAGS="-T 0"
-         YUVDENOISE_FLAGS="-l 2 -t 6 -S 0"
-@@ -782,7 +782,7 @@
-         Y4MDENOISE_FLAGS="${Y4MDENOISE_FLAGS} -t 2"
-         Y4MUNSHARP_FLAGS="-L 2.0,0.3,0"
- 
--    elif test "${FILTER_LEVEL}" == "heavy"; then
-+    elif test "${FILTER_LEVEL}" = "heavy"; then
- 
-         YUVMEDIANFILTER_FLAGS=""
-         YUVDENOISE_FLAGS="-l 3 -t 8 -S 0"
-@@ -801,46 +801,46 @@
-     fi
- 
-     # filter type
--    if test "${FILTER_TYPE}" == "none"; then
-+    if test "${FILTER_TYPE}" = "none"; then
- 
-         FILTER=""
- 
--    elif test "${FILTER_TYPE}" == "hqdenoise"; then
-+    elif test "${FILTER_TYPE}" = "hqdenoise"; then
- 
-         test_bin ${Y4MDENOISE}
-         FILTER="${Y4MDENOISE} ${Y4MDENOISE_FLAGS} |"
- 
--    elif test "${FILTER_TYPE}" == "mean"; then
-+    elif test "${FILTER_TYPE}" = "mean"; then
-     
-         test_bin ${YUVMEDIANFILTER}
-         FILTER="${YUVMEDIANFILTER} ${MEANFILTER_FLAGS} |"
- 
--    elif test "${FILTER_TYPE}" == "median"; then
-+    elif test "${FILTER_TYPE}" = "median"; then
- 
-         test_bin ${YUVMEDIANFILTER}
-         FILTER="${YUVMEDIANFILTER} ${YUVMEDIANFILTER_FLAGS} |"
- 
--    elif test "${FILTER_TYPE}" == "spatial"; then
-+    elif test "${FILTER_TYPE}" = "spatial"; then
- 
-         test_bin ${Y4MSPATIALFILTER}
-         FILTER="${Y4MSPATIALFILTER} ${Y4MSPATIALFILTER_FLAGS} |"
- 
--    elif test "${FILTER_TYPE}" == "temporal_old"; then
-+    elif test "${FILTER_TYPE}" = "temporal_old"; then
- 
-         test_bin ${YUVDENOISE}
-         FILTER="${YUVDENOISE} ${YUVDENOISE_FLAGS} |"
- 
--    elif test "${FILTER_TYPE}" == "temporal_rc1"; then
-+    elif test "${FILTER_TYPE}" = "temporal_rc1"; then
- 
-         test_bin ${YUVDENOISE}
-         FILTER="${YUVDENOISE} ${YUVDENOISE2_FLAGS} |"
- 
--    elif test "${FILTER_TYPE}" == "temporal"; then
-+    elif test "${FILTER_TYPE}" = "temporal"; then
-         
-         test_bin ${YUVDENOISE}
-         FILTER="${YUVDENOISE} ${YUVDENOISE3_FLAGS} |"
- 
--    elif test "${FILTER_TYPE}" == "unsharp"; then
-+    elif test "${FILTER_TYPE}" = "unsharp"; then
- 
-         test_bin ${Y4MUNSHARP}
-         FILTER="${Y4MUNSHARP} ${Y4MUNSHARP_FLAGS} |"
-@@ -857,7 +857,7 @@
- done
- 
- # 3:2 pulldown
--if test "${VID_FPS_OUT}" == "24000:1001" && test "${VID_FMT_OUT}" == "m2v"; then
-+if test "${VID_FPS_OUT}" = "24000:1001" && test "${VID_FMT_OUT}" = "m2v"; then
- 
-     FF_ENC="${FF_ENC}"
-     MPEG2ENC="${MPEG2ENC} -p"
-@@ -865,12 +865,12 @@
- fi
- 
- # quantisation matrices
--if test "${MATRICES}" == "kvcd"; then
-+if test "${MATRICES}" = "kvcd"; then
- 
-     FF_ENC="${FF_ENC} -intra_matrix ${INTRA_KVCD} -inter_matrix ${INTER_KVCD}"
-     MPEG2ENC="${MPEG2ENC} -K kvcd"
- 
--elif test "${MATRICES}" == "mvcd"; then
-+elif test "${MATRICES}" = "mvcd"; then
- 
-     echo "`matrix_copy ${INTRA_MVCD}`" > ${CQMFILE}
-     echo "`matrix_copy ${INTER_MVCD}`" >> ${CQMFILE}
-@@ -878,7 +878,7 @@
-     FF_ENC="${FF_ENC} -intra_matrix ${INTRA_MVCD} -inter_matrix ${INTER_MVCD}"
-     MPEG2ENC="${MPEG2ENC} -K file=${CQMFILE}"
- 
--elif test "${MATRICES}" == "tmpgenc"; then
-+elif test "${MATRICES}" = "tmpgenc"; then
- 
-     FF_ENC="${FF_ENC} -intra_matrix ${INTRA_TMPGENC} -inter_matrix ${INTER_TMPGENC}"
-     MPEG2ENC="${MPEG2ENC} -K tmpgenc"
-@@ -886,13 +886,13 @@
- fi
- 
- # video encoding mode
--if test "${ENC_TYPE}" == "cbr"; then
-+if test "${ENC_TYPE}" = "cbr"; then
- 
-     # when using -q with mpeg2enc, variable bitrate is selected.
-     # it's not ok for vcds...
-     MPEG2ENC="${MPEG2ENC}"
- 
--elif test "${ENC_TYPE}" == "abr"; then
-+elif test "${ENC_TYPE}" = "abr"; then
- 
-     if test "${DURATION}" != ""; then
-     
-@@ -948,13 +948,13 @@
- fi
- 
- # video encoder
--if test "${ENC_TOOL}" == "ffmpeg"; then
-+if test "${ENC_TOOL}" = "ffmpeg"; then
- 
-     test_bin ${FFMPEG}
-     ANALYSER="${FF_STATS} -y \"${VIDEO_OUT}\""
-     ENCODER="${FF_ENC} -y \"${VIDEO_OUT}\""
- 
--elif test "${ENC_TOOL}" == "mpeg2enc"; then
-+elif test "${ENC_TOOL}" = "mpeg2enc"; then
- 
-     test_bin ${MPEG2ENC}
-     ANALYSER="${MPEG2ENC_STATS} -o \"${VIDEO_OUT}\""
-@@ -969,7 +969,7 @@
- fi
- 
- # audio resampler
--if test "${AUD_FREQ_SRC}" == "${AUD_FREQ_OUT}"; then
-+if test "${AUD_FREQ_SRC}" = "${AUD_FREQ_OUT}"; then
- 
-     AUDIO_RESAMPLER=""
- 
-@@ -981,12 +981,12 @@
- fi
- 
- # audio decoder/encoder
--if test "${ACOPY_MODE}" == "1"; then
-+if test "${ACOPY_MODE}" = "1"; then
- 
-     AUDIO_DECODER="${FFMPEG} ${FF_DEC_AFLAGS}"
-     AUDIO_ENCODER="-acodec copy -y \"${AUDIO_OUT}\""
- 
--elif test "${AUD_FREQ_SRC}" == "${AUD_FREQ_OUT}"; then
-+elif test "${AUD_FREQ_SRC}" = "${AUD_FREQ_OUT}"; then
- 
-     AUDIO_DECODER="${FFMPEG} ${FF_DEC_AFLAGS}"
-     AUDIO_ENCODER="-ab ${AUD_BITRATE_OUT} -ac ${AUD_CHANNELS_OUT} -y \"${AUDIO_OUT}\""
-@@ -1011,11 +1011,11 @@
- show_info "   pixel aspect ratio: ${VID_SAR_OUT}"
- 
- # video "analyse"
--if ! test "${BLIND_MODE}" == "1" && test "${ENC_TYPE}" == "abr"; then
-+if ! test "${BLIND_MODE}" = "1" && test "${ENC_TYPE}" = "abr"; then
- 
-     eval "${DECODER} ${FILTERS} ${FRC} ${SCALER} ${PIPE_BUFFER} ${ANALYSER}"
-     
--    if test "${ENC_TOOL}" == "mpeg2enc"; then
-+    if test "${ENC_TOOL}" = "mpeg2enc"; then
-     
-         QUANT="`mpeg2enc_statfile_analyse ${STATFILE}`"
-         QUANT="`range_check $QUANT 3 31`"
-@@ -1026,23 +1026,23 @@
- fi
- 
- # video (de)coding
--if ! test "${BLIND_MODE}" == "1"; then
-+if ! test "${BLIND_MODE}" = "1"; then
- 
-     eval "${DECODER} ${FILTERS} ${FRC} ${SCALER} ${PIPE_BUFFER} ${ENCODER}"
- 
- fi
- 
- # audio (de)coding
--if ! test "${MUTE_MODE}" == "1"; then
-+if ! test "${MUTE_MODE}" = "1"; then
- 
-     eval "${AUDIO_DECODER} ${AUDIO_RESAMPLER} ${AUDIO_ENCODER}"
- 
- fi
- 
- # multiplexing
--if ! test "${BLIND_MODE}" == "1" && ! test "${MUTE_MODE}" == "1"; then
-+if ! test "${BLIND_MODE}" = "1" && ! test "${MUTE_MODE}" = "1"; then
- 
--    if test "${REQUANT_MODE}" == "1"; then
-+    if test "${REQUANT_MODE}" = "1"; then
- 
-         VID_SRC_SIZE="`ls -l ${VIDEO_OUT} | awk '{print $5}'`"
-         AUD_SRC_SIZE="`ls -l ${AUDIO_OUT} | awk '{print $5}'`"
+--- scripts/lavtc.sh.orig	2008-05-05 16:28:44.000000000 +0200
++++ scripts/lavtc.sh
+@@ -424,7 +424,7 @@ setDeinterlaceArgs ()
+ 	#
+ 	inputFile="${inFile}"
+ 	inputVideoCodec="lav"
+-	if [[ ${videoIsInterlaced} == 0 || ${deinterlacer=none} == "none" ]] ; then
++	if [[ ${videoIsInterlaced} = 0 || ${deinterlacer=none} = "none" ]] ; then
+ 		deinterlacerText="No deinterlacing"
+ 		setFlipArgs
+ 	elif [ ${deinterlacer} = "smart" ] ; then
+@@ -663,8 +663,8 @@ setVideoBW
+ 	log_info "encoding ${inFile}"
+ 	log_info "input video: ${videoWidth}x${videoHeight}"
+ 	log_info "input total length: ${totalFrames} frames (${videoSeconds} seconds)"
+-	log_info "deinterlace type: ${deinterlacer} (input is " `if [[ ${videoIsInterlaced} == 0 ]] ; then echo -n "not " ; fi ` " interlaced)"
+-	if [[ ${audioInChannels} == 0 ]] ; then
++	log_info "deinterlace type: ${deinterlacer} (input is " `if [[ ${videoIsInterlaced} = 0 ]] ; then echo -n "not " ; fi ` " interlaced)"
++	if [[ ${audioInChannels} = 0 ]] ; then
+ 		log_info "no audio on input"
+ 	else
+ 		log_info "input audio: ${audioInRate},${audioInBits},${audioInChannels}"
+@@ -748,7 +748,7 @@ do
+ 		else
+ 			corrector="cat"
+ 		fi
+-		if [ ${deinterlacer} == "kineco" ] ; then
++		if [ ${deinterlacer} = "kineco" ] ; then
+ 			deinterlaceCmd="yuvkineco -F 1 "
+ 		else
+ 			deinterlaceCmd="yuvdenoise -I -v 0 "
+@@ -757,10 +757,10 @@ do
+ 		log_debug "lav2yuv ${inFile} | ${corrector} | ${deinterlaceCmd} > ${fifo} &"
+ 		lav2yuv ${inFile} | ${corrector} | ${deinterlaceCmd} > ${fifo} &
+ 	fi
+-	if [[ "${audioInChannels}" == 0 ]] ; then
++	if [[ "${audioInChannels}" = 0 ]] ; then
+ 		inputAudioCodec=",null"
+ 		outputAudioCodec=",null"
+-	elif [[ ${pass} == 2 ]] ; then
++	elif [[ ${pass} = 2 ]] ; then
+ 		inputAudioCodec=",lav"
+ 	fi
+ 	inputCodecArgs="-x ${inputVideoCodec}${inputAudioCodec}"