[Sumover-dev] [svn commit] r4368 - vic/branches/mpeg4/video

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

Author: douglask
Date: Tue Jan 27 07:09:05 2009
New Revision: 4368

Modified:
   vic/branches/mpeg4/video/grabber.cpp

Log:
set_size_cif() still seems to be getting called with H.264, so removed resizing to 4CIF code when 480 or 576 heights are inputs as a workaround.

This is no real issue as the only codec that should be restricted to 4CIF is H263, but VIC's H263 implementation is limited to a max of CIF.

Modified: vic/branches/mpeg4/video/grabber.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber.cpp	(original)
+++ vic/branches/mpeg4/video/grabber.cpp	Tue Jan 27 07:09:05 2009
@@ -461,20 +461,6 @@
 
 	int ispal;
 	switch (h) {
-	case 576:
-		/* 4CIF */
-		ispal = 1;
-		outw_ = 704;
-		outh_ = 576;
-		break;
-
-	case 480:
-		/* NTSC */
-		ispal = 0;
-		outw_ = 704;
-		outh_ = 576;
-		break;
-
 	case 240:
 		/* 1/4 NTSC */
 		ispal = 0;