"Allows you to specify the image format in which the video snapshots will " \
"be stored.")
+#define CROP_TEXT N_("Video cropping")
+#define CROP_LONGTEXT N_( \
+ "This will force the cropping of the source video. " \
+ "Accepted formats are x:y (4:3, 16:9, etc.) expressing the global image " \
+ "aspect.")
+
#define ASPECT_RATIO_TEXT N_("Source aspect ratio")
#define ASPECT_RATIO_LONGTEXT N_( \
"This will force the source aspect ratio. For instance, some DVDs claim " \
"aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \
"squareness.")
-#define MASPECT_RATIO_TEXT N_("Monitor aspect ratio")
+#define HDTV_FIX_TEXT N_("Fix HDTV height")
+#define HDTV_FIX_LONGTEXT N_( \
+ "This option allows proper handling of HDTV-1080 video format " \
+ "even if broken encoder incorrectly set height to 1088 lines. " \
+ "Disable this option only if your video has non-standard format " \
+ "requiring all 1088 lines.")
+
+#define MASPECT_RATIO_TEXT N_("Monitor pixel aspect ratio")
#define MASPECT_RATIO_LONGTEXT N_( \
- "This will force the monitor aspect ratio. Most monitors have a 4:3." \
- "If you have a 16:9 screen, you will need to change this to 16:9 in" \
- "order to keep proportions.")
+ "This will force the monitor aspect ratio. Most monitors have square " \
+ "pixels (1:1). If you have a 16:9 screen, you might need to change this " \
+ "to 4:3 in order to keep proportions.")
#define SKIP_FRAMES_TEXT N_("Skip frames")
#define SKIP_FRAMES_LONGTEXT N_( \
#define MTU_TEXT N_("MTU of the network interface")
#define MTU_LONGTEXT N_( \
- "This is the typical size of UDP packets that we expect. On Ethernet " \
- "it is usually 1500.")
+ "This is the maximum packet size that can be transmitted " \
+ "over network interface. On Ethernet it is usually 1500 bytes.")
#define TTL_TEXT N_("Time To Live")
#define TTL_LONGTEXT N_( \
#define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in DVD menus.")
#define NAV_ACTIVATE_KEY_TEXT N_("Activate")
#define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.")
+#define DISC_MENU_TEXT N_("Go to the DVD menu")
+#define DISC_MENU_LONGTEXT N_("Select the key to take you to the DVD menu")
#define TITLE_PREV_TEXT N_("Select previous DVD title")
#define TITLE_PREV_LONGTEXT N_("Select the key to choose the previous title from the DVD")
#define TITLE_NEXT_TEXT N_("Select next DVD title")
add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE );
add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE );
add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE );
- add_string( "aspect-ratio", "", NULL,
- ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE );
- add_string( "monitor-aspect-ratio", "4:3", NULL,
- MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, VLC_FALSE );
+ add_string( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, VLC_FALSE );
+ add_string( "aspect-ratio", NULL, NULL,
+ ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE );
+ add_string( "monitor-par", NULL, NULL,
+ MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, VLC_TRUE );
+ add_bool( "hdtv-fix", 1, NULL, HDTV_FIX_TEXT, HDTV_FIX_LONGTEXT, VLC_TRUE );
add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT,
VIDEO_DECO_LONGTEXT, VLC_TRUE );
add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT,
#endif
add_string( "sub-autodetect-path", SUB_PATH, NULL,
SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE );
- add_integer( "sub-margin", -1, NULL, SUB_MARGIN_TEXT,
+ add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT,
SUB_MARGIN_LONGTEXT, VLC_TRUE );
add_deprecated( "spu-margin", VLC_FALSE ); /*Deprecated since 0.8.2 */
set_section( N_( "Overlays" ) , NULL );
/* Input options */
set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
- add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE );
- add_module( "access", "access2", NULL, NULL, ACCESS_TEXT,
- ACCESS_LONGTEXT, VLC_TRUE );
-
- set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );
- add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL,
- ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, VLC_FALSE );
-
-
- set_subcategory( SUBCAT_INPUT_DEMUX );
- add_module( "demux", "demux2", NULL, NULL, DEMUX_TEXT,
- DEMUX_LONGTEXT, VLC_TRUE );
- set_subcategory( SUBCAT_INPUT_VCODEC );
- set_subcategory( SUBCAT_INPUT_ACODEC );
- set_subcategory( SUBCAT_INPUT_SCODEC );
- set_subcategory( SUBCAT_INPUT_ADVANCED );
+ set_subcategory( SUBCAT_INPUT_GENERAL );
set_section( N_( "Track settings" ), NULL );
add_integer( "program", 0, NULL,
set_section( N_( "Advanced" ), NULL );
add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT,
- CR_AVERAGE_LONGTEXT, VLC_FALSE );
+ CR_AVERAGE_LONGTEXT, VLC_TRUE );
add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT,
- CLOCK_SYNCHRO_LONGTEXT, VLC_FALSE );
+ CLOCK_SYNCHRO_LONGTEXT, VLC_TRUE );
change_integer_list( pi_clock_values, ppsz_clock_descriptions, 0 );
/* Decoder options */
add_string( "encoder", NULL, NULL, ENCODER_TEXT,
ENCODER_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_INPUT_ACCESS );
+ add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE );
+ add_module( "access", "access2", NULL, NULL, ACCESS_TEXT,
+ ACCESS_LONGTEXT, VLC_TRUE );
+
+ set_subcategory( SUBCAT_INPUT_ACCESS_FILTER );
+ add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL,
+ ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, VLC_FALSE );
+
+
+ set_subcategory( SUBCAT_INPUT_DEMUX );
+ add_module( "demux", "demux2", NULL, NULL, DEMUX_TEXT,
+ DEMUX_LONGTEXT, VLC_TRUE );
+ set_subcategory( SUBCAT_INPUT_VCODEC );
+ set_subcategory( SUBCAT_INPUT_ACODEC );
+ set_subcategory( SUBCAT_INPUT_SCODEC );
+
/* Stream output options */
set_category( CAT_SOUT );
add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT,
MINIMIZE_THREADS_LONGTEXT, VLC_TRUE );
-#if !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H)
- add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT,
+#if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H)
+ add_bool( "rt-priority", VLC_FALSE, NULL, RT_PRIORITY_TEXT,
RT_PRIORITY_LONGTEXT, VLC_TRUE );
#endif
# define KEY_SUBTITLE_TRACK 's'
# define KEY_INTF_SHOW 'i'
# define KEY_INTF_HIDE 'I'
+# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m'
# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p'
# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n'
# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
# define KEY_SUBTITLE_TRACK 'k'
# define KEY_INTF_SHOW 'i'
# define KEY_INTF_HIDE 'I'
+# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m'
# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p'
# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n'
# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
add_key( "key-nav-right", KEY_NAV_RIGHT, NULL, NAV_RIGHT_KEY_TEXT,
NAV_RIGHT_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-disc-menu", KEY_DISC_MENU, NULL, DISC_MENU_TEXT,
+ DISC_MENU_LONGTEXT, VLC_TRUE );
add_key( "key-title-prev", KEY_TITLE_PREV, NULL, TITLE_PREV_TEXT,
TITLE_PREV_LONGTEXT, VLC_TRUE );
add_key( "key-title-next", KEY_TITLE_NEXT, NULL, TITLE_NEXT_TEXT,
{ "key-nav-down", ACTIONID_NAV_DOWN, 0, 0, 0, 0 },
{ "key-nav-left", ACTIONID_NAV_LEFT, 0, 0, 0, 0 },
{ "key-nav-right", ACTIONID_NAV_RIGHT, 0, 0, 0, 0 },
+ { "key-disc-menu", ACTIONID_DISC_MENU, 0, 0, 0, 0 },
{ "key-title-prev", ACTIONID_TITLE_PREV, 0, 0, 0, 0 },
{ "key-title-next", ACTIONID_TITLE_NEXT, 0, 0, 0, 0 },
{ "key-chapter-prev", ACTIONID_CHAPTER_PREV, 0, 0, 0, 0 },
projects / vlc / blobdiff