Merge branch 'master' of git://git.videolan.org/vlc

modules/access/http.c

@@ -440,6 +440,7 @@ connect:
         if( p_sys->url.psz_username && p_sys->url.psz_password &&
             p_sys->auth.psz_nonce && p_sys->auth.i_nonce == 0 )
         {
+            Disconnect( p_access );
             goto connect;
         }
         snprintf( psz_msg, 250,
@@ -457,6 +458,7 @@ connect:
             if( psz_password ) p_sys->url.psz_password = strdup( psz_password );
             free( psz_login );
             free( psz_password );
+            Disconnect( p_access );
             goto connect;
         }
         else

modules/access/v4l2/v4l2.c

@@ -1472,7 +1472,8 @@ static block_t* GrabVideo( demux_t *p_demux )
         /* Unlock */
         if( ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 )
         {
-            msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)");
+            msg_Err( p_demux, "Failed to unlock (VIDIOC_QBUF)" );
+            block_Release( p_block );
             return 0;
         }
 
@@ -1519,7 +1520,8 @@ static block_t* GrabVideo( demux_t *p_demux )
         /* Unlock */
         if( ioctl( p_sys->i_fd_video, VIDIOC_QBUF, &buf ) < 0 )
         {
-            msg_Err (p_demux, "Failed to unlock (VIDIOC_QBUF)");
+            msg_Err( p_demux, "Failed to unlock (VIDIOC_QBUF)" );
+            block_Release( p_block );
             return 0;
         }
 

modules/misc/Modules.am

@@ -14,9 +14,9 @@ SOURCES_gtk2_main = gtk_main.c
 SOURCES_gnome2_main = gtk_main.c
 SOURCES_screensaver = screensaver.c
 SOURCES_qte_main = qte_main.cpp
-SOURCES_freetype = freetype.c
+SOURCES_freetype = freetype.c text_renderer.h
 SOURCES_win32text = win32text.c
-SOURCES_quartztext = quartztext.c
+SOURCES_quartztext = quartztext.c text_renderer.h
 SOURCES_logger = logger.c
 SOURCES_vod_rtsp = rtsp.c
 SOURCES_gnutls = gnutls.c dhparams.h