From ccb0d0598aa9a01c8cff2fb9fee553bdba104bcc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 5 Oct 2017 13:26:10 +0200 Subject: [PATCH] Revert "adding 4k video settings for armbox" This reverts commit d442d4c35f22e7e6115a9eef9a02da7eef47903e. Was applied two times by mistake. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a95badc39409780b7dd865988a988e83001de903 Author: vanhofen Date: 2017-10-05 (Thu, 05 Oct 2017) ------------------ This commit was generated by Migit --- src/gui/videosettings.cpp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index d9579f706..079840f64 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -290,27 +290,6 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_2160P50, NONEXISTANT_LOCALE, "2160p 50Hz" }, { -1, NONEXISTANT_LOCALE, "Auto" } }; -#elif HAVE_ARM_HARDWARE -CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = -{ - { -1, NONEXISTANT_LOCALE, "SECAM" }, - { VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" }, - { VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" }, - { VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" }, - { VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" }, - { VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" }, - { VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" }, - { -1, NONEXISTANT_LOCALE, "NTSC" }, - { -1, NONEXISTANT_LOCALE, "480p" }, - { VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" }, - { VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" }, - { VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" }, - { VIDEO_STD_2160P24, NONEXISTANT_LOCALE, "2160p 24Hz" }, - { VIDEO_STD_2160P25, NONEXISTANT_LOCALE, "2160p 25Hz" }, - { VIDEO_STD_2160P30, NONEXISTANT_LOCALE, "2160p 30Hz" }, - { VIDEO_STD_2160P50, NONEXISTANT_LOCALE, "2160p 50Hz" }, - { -1, NONEXISTANT_LOCALE, "Auto" } -}; #else /* generic PC -> 4 different resolutions, 480, 576, 720 and 1080 lines */