Merge remote-tracking branch 'seife/master'

This commit is contained in:
martii
2013-05-26 08:09:50 +02:00
4 changed files with 4 additions and 4 deletions

View File

@@ -91,7 +91,7 @@ typedef enum {
VIDEO_STD_1080P25,
VIDEO_STD_AUTO,
VIDEO_STD_1080P50, /* SPARK only */
VIDEO_STD_MAX = VIDEO_STD_1080P50
VIDEO_STD_MAX
} VIDEO_STD;
/* not used, for dummy functions */

View File

@@ -97,7 +97,7 @@ typedef enum {
VIDEO_STD_1080P25,
VIDEO_STD_AUTO,
VIDEO_STD_1080P50, /* SPARK only */
VIDEO_STD_MAX = VIDEO_STD_1080P50
VIDEO_STD_MAX
} VIDEO_STD;
/* not used, for dummy functions */

View File

@@ -91,7 +91,7 @@ typedef enum {
VIDEO_STD_1080P25,
VIDEO_STD_AUTO,
VIDEO_STD_1080P50, /* SPARK only */
VIDEO_STD_MAX = VIDEO_STD_1080P50
VIDEO_STD_MAX
} VIDEO_STD;
/* not used, for dummy functions */

View File

@@ -83,7 +83,7 @@ typedef enum {
VIDEO_STD_PAL = VID_DISPFMT_PAL, /* 1 */
VIDEO_STD_SECAM = VID_DISPFMT_SECAM, /* 4 */
VIDEO_STD_1080I50 = VIDEO_STD_PAL, /* hack, this is used in neutrino settings default */
VIDEO_STD_MAX = VIDEO_STD_SECAM
VIDEO_STD_MAX = VIDEO_STD_SECAM + 1
} VIDEO_STD;
typedef enum {