* Merged trunk changes r9184:9186 to 0.8.1 branch.

include/vlc_filter.h

@@ -55,7 +55,7 @@ struct filter_t
     block_t *           ( * pf_audio_filter ) ( filter_t *, block_t * );
     void                ( * pf_video_blend )  ( filter_t *, picture_t *,
                                                 picture_t *, picture_t *,
-                                                int, int );
+                                                int, int, int );
 
     subpicture_t *      ( *pf_sub_filter ) ( filter_t *, mtime_t );
     subpicture_t *      ( *pf_render_string ) ( filter_t *, block_t * );

modules/misc/gnutls.c

@@ -63,8 +63,8 @@ vlc_module_begin();
     set_capability( "tls", 1 );
     set_callbacks( Open, Close );
 
-    /*add_integer( "dh-bits", 1024, NULL, DH_BITS_TEXT,
-                 DH_BITS_LONGTEXT, VLC_TRUE );*/
+    add_integer( "dh-bits", DH_BITS, NULL, DH_BITS_TEXT,
+                 DH_BITS_LONGTEXT, VLC_TRUE );
 vlc_module_end();
 
 
@@ -168,6 +168,7 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server )
     tls_session_t *p_session;
     gnutls_session *p_sys;
     int val;
+    vlc_value_t bits;
 
     p_sys = (gnutls_session *)malloc( sizeof(gnutls_session *) );
     if( p_sys == NULL )
@@ -208,7 +209,14 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server )
     /*gnutls_certificate_server_set_request( p_session->session,
                                            GNUTLS_CERT_REQUEST ); */
 
-    gnutls_dh_set_prime_bits( *p_sys, DH_BITS );
+    if( var_Get( p_server->p_tls, "dh-bits", &bits ) != VLC_SUCCESS )
+    {
+        var_Create( p_server->p_tls, "dh-bits",
+                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+        var_Get( p_server->p_tls, "dh-bits", &bits );
+    }
+
+    gnutls_dh_set_prime_bits( *p_sys, bits.i_int );
 
     p_session = malloc( sizeof (struct tls_session_t) );
     if( p_session == NULL )
@@ -350,8 +358,18 @@ gnutls_ServerCreate( tls_t *p_this, const char *psz_cert_path,
     val = gnutls_dh_params_init( &p_server_sys->dh_params );
     if( val >= 0 )
     {
+        vlc_value_t bits;
+
+        if( var_Get( p_this, "dh-bits", &bits ) != VLC_SUCCESS )
+        {
+            var_Create( p_this, "dh-bits",
+                        VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+            var_Get( p_this, "dh-bits", &bits );
+        }
+
         msg_Dbg( p_this, "Computing Diffie Hellman ciphers parameters" );
-        val = gnutls_dh_params_generate2( p_server_sys->dh_params, DH_BITS );
+        val = gnutls_dh_params_generate2( p_server_sys->dh_params,
+                                          bits.i_int );
     }
     if( val < 0 )
     {
@@ -459,13 +477,13 @@ Open( vlc_object_t *p_this )
         if( gnutls_global_init( ) )
         {
             msg_Warn( p_this, "cannot initialize GNUTLS" );
-            vlc_mutex_unlock( lock.p_address);
+            vlc_mutex_unlock( lock.p_address );
             return VLC_EGENERIC;
         }
         if( gnutls_check_version( "1.0.0" ) == NULL )
         {
             gnutls_global_deinit( );
-            vlc_mutex_unlock( lock.p_address);
+            vlc_mutex_unlock( lock.p_address );
             msg_Err( p_this, "unsupported GNUTLS version" );
             return VLC_EGENERIC;
         }

modules/video_filter/logo.c

@@ -441,7 +441,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
     vout_DatePicture( p_sys->p_vout, p_outpic, p_pic->date );
 
     p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic, p_outpic,
-                                    p_sys->p_pic, p_sys->posx, p_sys->posy );
+                                    p_sys->p_pic, p_sys->posx, p_sys->posy,
+                                    255 );
 
     vout_DisplayPicture( p_sys->p_vout, p_outpic );
 }

src/video_output/vout_subpictures.c

@@ -725,7 +725,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
                     p_fmt->i_height;
 
            p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
-                p_pic_src, &p_region->picture, i_x_offset, i_y_offset );
+                p_pic_src, &p_region->picture, i_x_offset, i_y_offset, 255 );
 
             p_region = p_region->p_next;
         }