[Sumover-dev] [svn commit] r3960 - in vic/branches/mpeg4: codec tcl

[sumover-dev at cs.ucl.ac.uk]

Author: barz
Date: Wed Jan 17 12:15:19 2007
New Revision: 3960

Modified:
   vic/branches/mpeg4/codec/x264encoder.cpp
   vic/branches/mpeg4/configure
   vic/branches/mpeg4/tcl/ui-windows.tcl

Log:
bugfix: h.264 double release encoding picture

Modified: vic/branches/mpeg4/codec/x264encoder.cpp
==============================================================================
--- vic/branches/mpeg4/codec/x264encoder.cpp	(original)
+++ vic/branches/mpeg4/codec/x264encoder.cpp	Wed Jan 17 12:15:19 2007
@@ -36,7 +36,7 @@
     x264 *enc = (x264 *) encoder;
     if (enc->h != NULL) {
 	  x264_encoder_close(enc->h);
-	  x264_picture_clean(&(enc->pic));
+//	  x264_picture_clean(&(enc->pic));
     }
     free(enc);
 }

Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure	(original)
+++ vic/branches/mpeg4/configure	Wed Jan 17 12:15:19 2007
@@ -4471,6 +4471,7 @@
 		/System/Library/Frameworks/Tk.framework/Versions/8.4/Resources/Scripts \
 		/usr/contrib/lib/tk8.4 \
 		/usr/lib/tk8.4 \
+		/usr/share/tk8.4 \
 		/usr/lib/tk/tk8.4 \
 		/import/tcl/lib/tk8.4 \
 		$prefix/lib/tk8.4 \

Modified: vic/branches/mpeg4/tcl/ui-windows.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/ui-windows.tcl	(original)
+++ vic/branches/mpeg4/tcl/ui-windows.tcl	Wed Jan 17 12:15:19 2007
@@ -188,11 +188,11 @@
 	toplevel $w -class Vic \
 		-visual "[winfo visual .top] [winfo depth .top]" \
 		-colormap .top
-	catch "wm resizable $w false false"
+	#catch "wm resizable $w false false"
 	#
 	# make windows become x-y resizeable
 	#
-	#catch "wm resizable $w ture false"
+	catch "wm resizable $w true false"
 	frame $w.frame