Fix OSD (text & widgets) aspect ratio

put category in HTTP interface options

diff --git a/modules/control/http.c b/modules/control/http.c
index 2d57d93084b4c8a925896cdd045e5bf2a3f07bd0..18d53e70022ee31ce5a6dae3557040e8c63e465d 100644 (file)
--- a/modules/control/http.c
+++ b/modules/control/http.c
@@ -95,6 +95,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INTERFACE_GENERAL );
         add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
         add_string ( "http-src",  NULL, NULL, SRC_TEXT,  SRC_LONGTEXT,  VLC_TRUE );
+        set_section( N_("HTTP SSL" ), 0 );
         add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, VLC_TRUE );
         add_string ( "http-intf-key",  NULL, NULL, KEY_TEXT,  KEY_LONGTEXT,  VLC_TRUE );
         add_string ( "http-intf-ca",   NULL, NULL, CA_TEXT,   CA_LONGTEXT,   VLC_TRUE );

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index eaba49a8148d4301205cd5aa40fc927892a0e5cf..88a6e6c52cde452f0e1383e4172c05204093f359 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -317,7 +317,7 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region,
     /* Create a new subpicture region */
     memset( &fmt, 0, sizeof(video_format_t) );
     fmt.i_chroma = VLC_FOURCC('Y','U','V','P');
-    fmt.i_aspect = VOUT_ASPECT_FACTOR;
+    fmt.i_aspect = 0;
     fmt.i_width = fmt.i_visible_width = i_width + 4;
     fmt.i_height = fmt.i_visible_height = i_height + 4;
     fmt.i_x_offset = fmt.i_y_offset = 0;

diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index 27f4e2f278479db15e117578f0b75960b917a510..cd4063489b884d80b1bf4e2f56a64083fff48c81 100644 (file)
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -158,7 +158,7 @@ static void CreatePicture( spu_t *p_spu, subpicture_t *p_subpic,
     /* Create a new subpicture region */
     memset( &fmt, 0, sizeof(video_format_t) );
     fmt.i_chroma = VLC_FOURCC('Y','U','V','A');
-    fmt.i_aspect = VOUT_ASPECT_FACTOR;
+    fmt.i_aspect = 0;
     fmt.i_width = fmt.i_visible_width = i_width;
     fmt.i_height = fmt.i_visible_height = i_height;
     fmt.i_x_offset = fmt.i_y_offset = 0;