From 63197e95acf29535dc2e2b09f5dc4fb80bd99c7e Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 15 May 2012 10:24:30 +0200 Subject: [PATCH] DXTL issue warning when deinterlacing --- ultragrid/src/video_compress/dxt_glsl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ultragrid/src/video_compress/dxt_glsl.c b/ultragrid/src/video_compress/dxt_glsl.c index 0be31d3fd..eac13d244 100644 --- a/ultragrid/src/video_compress/dxt_glsl.c +++ b/ultragrid/src/video_compress/dxt_glsl.c @@ -99,7 +99,6 @@ static int configure_with(struct video_compress *s, struct video_frame *frame) vf_get_tile(s->out, x)->height = vf_get_tile(frame, 0)->height; } - s->out->interlacing = PROGRESSIVE; s->out->fps = frame->fps; s->out->color_spec = s->color_spec; @@ -141,10 +140,14 @@ static int configure_with(struct video_compress *s, struct video_frame *frame) } /* We will deinterlace the output frame */ - if(frame->interlacing == INTERLACED_MERGED) + if(frame->interlacing == INTERLACED_MERGED) { + s->out->interlacing = PROGRESSIVE; s->interlaced_input = TRUE; - else + fprintf(stderr, "[DXT compress] Enabling automatic deinterlacing.\n"); + } else { + s->out->interlacing = frame->interlacing; s->interlaced_input = FALSE; + } if(s->out->color_spec == DXT1) { s->encoder = dxt_encoder_create(DXT_TYPE_DXT1, s->out->tiles[0].width, s->out->tiles[0].height, format, s->legacy);