--- branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/05/17 13:26:51	1031
+++ branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/06/09 13:55:56	1054
@@ -3,7 +3,9 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Console based test application  -
  *
- *  Copyright(C) 2002-2003 Christoph Lampert
+ *  Copyright(C) 2002-2003 Christoph Lampert <gruel@web.de>
+ *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
+ *               2003      Peter Ross <pross@xvid.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +21,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: xvid_encraw.c,v 1.11.2.25 2003-05-17 13:21:26 suxen_drol Exp $
+ * $Id: xvid_encraw.c,v 1.11.2.27 2003-06-09 13:49:25 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -31,6 +33,8 @@
  *		                   
  *  The program is plain C and needs no libraries except for libxvidcore, 
  *  and maths-lib.
+ *
+ *  Use ./xvid_encraw -help for a list of options
  *	
  ************************************************************************/
 
@@ -321,7 +325,6 @@
 			ARG_OUTPUTFILE = argv[i];
 		} else if (strcmp("-vop_debug", argv[i]) == 0) {
 			ARG_VOPDEBUG = 1;
-
 		} else if (strcmp("-help", argv[i])) {
 			usage();
 			return (0);
@@ -644,7 +647,7 @@
 	fprintf(stderr,	" -bquant_offset integer: bframe quantizer offset (default=100)\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "Rate control options:\n");
-    fprintf(stderr, " -framerate float               : target framerate (>0 | default=25.0)\n");
+	fprintf(stderr, " -framerate float               : target framerate (>0 | default=25.0)\n");
 	fprintf(stderr,	" -bitrate   integer             : target bitrate\n");
     fprintf(stderr,	" -single                        : single pass mode\n");
 	fprintf(stderr, " -pass1     filename            : twopass mode (first pass)\n");
@@ -659,7 +662,8 @@
 	fprintf(stderr, " -packed         : packed mode\n");
 	fprintf(stderr, " -lumimasking    : use lumimasking algorithm\n");
 	fprintf(stderr, " -stats          : print stats about encoded frames\n");
-	fprintf(stderr, " -debug          : print all MB dquants\n");
+	fprintf(stderr, " -debug          : activates xvidcore internal debugging output\n");
+	fprintf(stderr, " -vop_debug      : print some info directly into encoded frames\n");
 	fprintf(stderr, " -help           : prints this help message\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "NB: You can define %d zones repeating the -z[qw] option as many times as needed.\n", MAX_ZONES);
@@ -813,7 +817,6 @@
 	/* Set version -- version checking will done by xvidcore */
 	memset(&xvid_gbl_init, 0, sizeof(xvid_gbl_init));
 	xvid_gbl_init.version = XVID_VERSION;
-    printf("0x%x\n", ARG_DEBUG);
     xvid_gbl_init.debug = ARG_DEBUG;
 
 
@@ -894,11 +897,13 @@
 		xvid_enc_create.num_plugins++;
 	}
 
-	/* if (ARG_DEBUG) {
+#if 0
+	if (ARG_DEBUG) {
 		plugins[xvid_enc_create.num_plugins].func = rawenc_debug;
 		plugins[xvid_enc_create.num_plugins].param = NULL;
 		xvid_enc_create.num_plugins++;
-	}*/
+	}
+#endif
 
 	/* No fancy thread tests */
 	xvid_enc_create.num_threads = 0;
@@ -913,7 +918,6 @@
 	}
 
 	/* Maximum key frame interval */
-
     if (ARG_MAXKEYINTERVAL > 0) {
         xvid_enc_create.max_key_interval = ARG_MAXKEYINTERVAL;
     }else {