From 5ccc8df9088ddc49c182ec95008519e5cb7890ae Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 3 Mar 2014 16:01:05 +0100 Subject: [PATCH] DELTACAST: fixed some variable name clash --- src/video_capture/deltacast.cpp | 4 ++-- src/video_display/deltacast.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_capture/deltacast.cpp b/src/video_capture/deltacast.cpp index 2de96d660..7bf766f21 100644 --- a/src/video_capture/deltacast.cpp +++ b/src/video_capture/deltacast.cpp @@ -139,7 +139,7 @@ static void usage(void) { printf("\t%d: %s", deltacast_frame_modes[i].mode, deltacast_frame_modes[i].name); - if (deltacast_frame_modes[i].interface != VHD_INTERFACE_AUTO) + if (deltacast_frame_modes[i].iface != VHD_INTERFACE_AUTO) printf("\t\t(no autodetection)"); printf("\n"); } @@ -249,7 +249,7 @@ static bool wait_for_channel(struct vidcap_deltacast_state *s) s->frame->interlacing = deltacast_frame_modes[i].interlacing; s->tile->width = deltacast_frame_modes[i].width; s->tile->height = deltacast_frame_modes[i].height; - Interface = deltacast_frame_modes[i].interface; + Interface = deltacast_frame_modes[i].iface; printf("[DELTACAST] %s mode selected. %dx%d @ %2.2f %s\n", deltacast_frame_modes[i].name, s->tile->width, s->tile->height, (double) s->frame->fps, get_interlacing_description(s->frame->interlacing)); break; diff --git a/src/video_display/deltacast.h b/src/video_display/deltacast.h index 136b2bb0f..df87df866 100644 --- a/src/video_display/deltacast.h +++ b/src/video_display/deltacast.h @@ -57,7 +57,7 @@ struct deltacast_frame_mode_t { unsigned int height; double fps; enum interlacing_t interlacing; - unsigned long int interface; + unsigned long int iface; }; extern const struct deltacast_frame_mode_t deltacast_frame_modes[];