scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 06:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

DXTL issue warning when deinterlacing

Browse Source
This commit is contained in:
Martin Pulec
2012-05-15 10:24:30 +02:00
parent 5113d5cbb3
commit 63197e95ac
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ultragrid/src/video_compress/dxt_glsl.c
View File

@@ -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);