View | Details | Raw Unified | Return to bug 7207
Collapse All | Expand All

(-)mjpegtools-1.7.0.orig/lavtools/lav_common.c (-6 lines)
Lines 314-320 int readframe(int numframe, Link Here
314
    dv_parse_header(decoder, jpeg_data);
314
    dv_parse_header(decoder, jpeg_data);
315
    switch(decoder->sampling) {
315
    switch(decoder->sampling) {
316
    case e_dv_sample_420:
316
    case e_dv_sample_420:
317
#ifdef LIBDV_PAL_YV12
318
      /* libdv decodes PAL DV directly as planar YUV 420
317
      /* libdv decodes PAL DV directly as planar YUV 420
319
       * (YV12 or 4CC 0x32315659) if configured with the flag
318
       * (YV12 or 4CC 0x32315659) if configured with the flag
320
       * --with-pal-yuv=YV12 which is not (!) the default
319
       * --with-pal-yuv=YV12 which is not (!) the default
Lines 335-341 int readframe(int numframe, Link Here
335
	frame[1] = frame_tmp;
334
	frame[1] = frame_tmp;
336
      }
335
      }
337
      break;
336
      break;
338
#endif /* LIBDV_PAL_YV12 */
339
    case e_dv_sample_411:
337
    case e_dv_sample_411:
340
    case e_dv_sample_422:
338
    case e_dv_sample_422:
341
      /* libdv decodes NTSC DV (native 411) and by default also PAL
339
      /* libdv decodes NTSC DV (native 411) and by default also PAL
Lines 467-475 void writeoutYUV4MPEGheader(int out_fd, Link Here
467
     dv_parse_header(decoder, jpeg_data);
465
     dv_parse_header(decoder, jpeg_data);
468
     switch(decoder->sampling) {
466
     switch(decoder->sampling) {
469
     case e_dv_sample_420:
467
     case e_dv_sample_420:
470
# ifndef LIBDV_PAL_YV12
471
       mjpeg_error_exit1("DV PAL YV12 input was not configured at compile time");
472
# else
473
       switch (param->chroma) {
468
       switch (param->chroma) {
474
       case Y4M_UNKNOWN:
469
       case Y4M_UNKNOWN:
475
	 mjpeg_info("set chroma '420paldv' from imput");
470
	 mjpeg_info("set chroma '420paldv' from imput");
Lines 486-492 void writeoutYUV4MPEGheader(int out_fd, Link Here
486
	 break;
481
	 break;
487
       }
482
       }
488
       break;
483
       break;
489
# endif
490
     case e_dv_sample_411:
484
     case e_dv_sample_411:
491
     case e_dv_sample_422:
485
     case e_dv_sample_422:
492
       if (param->chroma != Y4M_CHROMA_422)
486
       if (param->chroma != Y4M_CHROMA_422)
(-)mjpegtools-1.7.0.orig/lavtools/lav_io.c (-4 lines)
Lines 989-999 lav_file_t *lav_open_input_file(char *fi Link Here
989
#endif
989
#endif
990
      || strncasecmp(video_comp,"dv",2)==0) {
990
      || strncasecmp(video_comp,"dv",2)==0) {
991
       ierr = check_DV2_input(lav_fd);
991
       ierr = check_DV2_input(lav_fd);
992
#ifdef LIBDV_PAL_YV12
993
       lav_fd->MJPG_chroma = CHROMA420;
992
       lav_fd->MJPG_chroma = CHROMA420;
994
#else
995
       lav_fd->MJPG_chroma = CHROMA422;
996
#endif
997
       if (ierr) goto ERREXIT;
993
       if (ierr) goto ERREXIT;
998
       /* DV is always interlaced, bottom first */
994
       /* DV is always interlaced, bottom first */
999
       lav_fd->interlacing = LAV_INTER_BOTTOM_FIRST; 
995
       lav_fd->interlacing = LAV_INTER_BOTTOM_FIRST; 

Return to bug 7207