diff -u -r dvtext.orig/dvtext.h dvtext/dvtext.h --- dvtext.orig/dvtext.h 2004-04-20 10:46:52.000000000 +0200 +++ dvtext/dvtext.h 2004-10-02 21:55:52.099967096 +0200 @@ -40,9 +40,21 @@ #define DEFAULT_DPI 96 #define DEFAULT_OUTPUT_FILENAME "out.avi" +#if 0 +/* original NTSC */ #define NTSC_WIDTH 720 #define NTSC_HEIGHT 480 +#define NTSC_FPS 29.97 #define DV_FRAME_SIZE_NTSC 120000 +#define USE_PAL FALSE +#else +/* PAL data */ +#define NTSC_WIDTH 720 +#define NTSC_HEIGHT 576 +#define NTSC_FPS 25.0 +#define DV_FRAME_SIZE_NTSC 144000 +#define USE_PAL TRUE +#endif #define DEFAULT_SCROLL_YSPACING 15 diff -u -r dvtext.orig/fonts.c dvtext/fonts.c --- dvtext.orig/fonts.c 2004-04-20 11:04:50.000000000 +0200 +++ dvtext/fonts.c 2004-10-02 15:27:20.000000000 +0200 @@ -152,7 +152,7 @@ unsigned char fgcolor_b = (fgcolor & 0x000000FF) >> 0; for (i=0; iisPAL = FALSE; + encoder->isPAL = USE_PAL; encoder->is16x9 = FALSE; encoder->vlc_encode_passes = 3; encoder->static_qno = 0; @@ -125,7 +125,7 @@ return -1; } - int audiodata_size = 2 /*chan*/ * 2 /*bytes per samp*/ * 32000 /*samps/sec*/ / (float)29.97 /*frames/sec*/ ; + int audiodata_size = 2 /*chan*/ * 2 /*bytes per samp*/ * 32000 /*samps/sec*/ / (float)NTSC_FPS /*frames/sec*/ ; char* audiodata = (char*)malloc(audiodata_size); memset(audiodata, 0, audiodata_size); AVI_write_audio(avifile, audiodata, audiodata_size); @@ -172,13 +172,13 @@ return -1; } - AVI_set_video(avifile, 720, 480, 29.97, "DVSD"); + AVI_set_video(avifile, NTSC_WIDTH, NTSC_HEIGHT, NTSC_FPS, "DVSD"); AVI_set_audio(avifile, 2, 32000, 16, 1, 0); /* initialize libdv encoder */ encoder = dv_encoder_new(FALSE, FALSE, FALSE); - encoder->isPAL = FALSE; + encoder->isPAL = USE_PAL; encoder->is16x9 = FALSE; encoder->vlc_encode_passes = 3; encoder->static_qno = 0; @@ -241,7 +241,7 @@ return -1; } - int audiodata_size = 2 /*chan*/ * 2 /*bytes per samp*/ * 32000 /*samps/sec*/ / (float)29.97 /*frames/sec*/ ; + int audiodata_size = 2 /*chan*/ * 2 /*bytes per samp*/ * 32000 /*samps/sec*/ / (float)NTSC_FPS /*frames/sec*/ ; char* audiodata = (char*)malloc(audiodata_size); memset(audiodata, 0, audiodata_size); AVI_write_audio(avifile, audiodata, audiodata_size);