diff -Naurp mjpegtools-1.7.0.orig/lavtools/lav_common.c mjpegtools-1.7.0/lavtools/lav_common.c --- mjpegtools-1.7.0.orig/lavtools/lav_common.c 2005-02-22 20:05:59 +0300 +++ mjpegtools-1.7.0/lavtools/lav_common.c 2005-06-26 00:46:15 +0400 @@ -314,7 +314,6 @@ int readframe(int numframe, dv_parse_header(decoder, jpeg_data); switch(decoder->sampling) { case e_dv_sample_420: -#ifdef LIBDV_PAL_YV12 /* libdv decodes PAL DV directly as planar YUV 420 * (YV12 or 4CC 0x32315659) if configured with the flag * --with-pal-yuv=YV12 which is not (!) the default @@ -335,7 +334,6 @@ int readframe(int numframe, frame[1] = frame_tmp; } break; -#endif /* LIBDV_PAL_YV12 */ case e_dv_sample_411: case e_dv_sample_422: /* libdv decodes NTSC DV (native 411) and by default also PAL @@ -467,9 +465,6 @@ void writeoutYUV4MPEGheader(int out_fd, dv_parse_header(decoder, jpeg_data); switch(decoder->sampling) { case e_dv_sample_420: -# ifndef LIBDV_PAL_YV12 - mjpeg_error_exit1("DV PAL YV12 input was not configured at compile time"); -# else switch (param->chroma) { case Y4M_UNKNOWN: mjpeg_info("set chroma '420paldv' from imput"); @@ -486,7 +481,6 @@ void writeoutYUV4MPEGheader(int out_fd, break; } break; -# endif case e_dv_sample_411: case e_dv_sample_422: if (param->chroma != Y4M_CHROMA_422) diff -Naurp mjpegtools-1.7.0.orig/lavtools/lav_io.c mjpegtools-1.7.0/lavtools/lav_io.c --- mjpegtools-1.7.0.orig/lavtools/lav_io.c 2005-02-22 20:06:02 +0300 +++ mjpegtools-1.7.0/lavtools/lav_io.c 2005-06-26 00:45:53 +0400 @@ -989,11 +989,7 @@ lav_file_t *lav_open_input_file(char *fi #endif || strncasecmp(video_comp,"dv",2)==0) { ierr = check_DV2_input(lav_fd); -#ifdef LIBDV_PAL_YV12 lav_fd->MJPG_chroma = CHROMA420; -#else - lav_fd->MJPG_chroma = CHROMA422; -#endif if (ierr) goto ERREXIT; /* DV is always interlaced, bottom first */ lav_fd->interlacing = LAV_INTER_BOTTOM_FIRST;