# HG changeset patch
# User nathan
# Date 1292152517 -3600
# Node ID 31537cd8ec5eb4506f71d0aa69b43d63eee60306
# Parent  ba6464ebc3f90741361357f83d79137a5cbb4fc6
fixed image_convert.sh for newer mjpegtools

diff -r ba6464ebc3f9 -r 31537cd8ec5e HISTORY
--- a/HISTORY	Sun Dec 12 11:53:00 2010 +0100
+++ b/HISTORY	Sun Dec 12 12:15:17 2010 +0100
@@ -1,6 +1,12 @@
 VDR Plugin Revision History
 ---------------------------
 
+: Version 0.10.x (vdr 1.6.0-2)
+- Added a setup option to switch prev/next remote keys from chapter jump to
+  playlist jump.
+- Fixed compiling without OGG library.
+- Fixed image_convert.sh.examples for newer mjpegtools.
+
 29.12.2009: Version 0.10.2 (vdr 1.6.0-2)
 - Fixed a segfault while direct song selection. Thanks to Halim Sahin for
   reporting.
diff -r ba6464ebc3f9 -r 31537cd8ec5e examples/image_convert.sh.example
--- a/examples/image_convert.sh.example	Sun Dec 12 11:53:00 2010 +0100
+++ b/examples/image_convert.sh.example	Sun Dec 12 12:15:17 2010 +0100
@@ -55,7 +55,7 @@
 # 'chroma subsampling mode' mjpegtools >= 1.8.0
 #
 SUBSAMPLINGMODE=""
-if ppmtoy4m -h | egrep -q "'420mpeg2'"; then
+if ppmtoy4m -h 2>&1 | egrep -q "'420mpeg2'"; then
     SUBSAMPLINGMODE="-S 420mpeg2"
 fi
 #