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

DELTACAST: fixed some variable name clash

Browse Source
This commit is contained in:
Martin Pulec
2014-03-03 16:01:05 +01:00
parent 2d0c3781fd
commit 5ccc8df908
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_capture/deltacast.cpp
View File

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

2
src/video_display/deltacast.h
View File

@@ -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[];