From 1a90a3cdb5e542a891bec7da29f55530991d57b8 Mon Sep 17 00:00:00 2001
From: Gildas Bazin <gbazin@videolan.org>
Date: Sat, 5 Mar 2005 17:18:30 +0000
Subject: [PATCH] * ALL: a few fixes.

---
 modules/access/dvdnav.c     |  4 ++++
 modules/access/screen/x11.c |  5 +++--
 modules/codec/rawvideo.c    |  4 ++++
 modules/control/http.c      | 12 ++++--------
 src/input/input.c           |  2 +-
 src/interface/interface.c   |  5 +++--
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 5d6b5300a6..da1d81da03 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -734,6 +734,10 @@ static int Demux( demux_t *p_demux )
 
     case DVDNAV_STOP:   /* EOF */
         msg_Dbg( p_demux, "DVDNAV_STOP" );
+
+#if DVD_READ_CACHE
+        dvdnav_free_cache_block( p_sys->dvdnav, packet );
+#endif
         return 0;
 
     case DVDNAV_HIGHLIGHT:
diff --git a/modules/access/screen/x11.c b/modules/access/screen/x11.c
index e8ba1df76a..11a8ef0ede 100644
--- a/modules/access/screen/x11.c
+++ b/modules/access/screen/x11.c
@@ -69,9 +69,10 @@ int screen_InitCapture( demux_t *p_demux )
     case 16:
         i_chroma = VLC_FOURCC('R','V','1','6'); break;
     case 24:
-        i_chroma = VLC_FOURCC('R','V','2','4'); break;
     case 32:
-        i_chroma = VLC_FOURCC('R','V','3','2'); break;
+        i_chroma = VLC_FOURCC('R','V','3','2');
+        win_info.depth = 32;
+        break;
     default:
         msg_Err( p_demux, "unknown screen depth %i", win_info.depth );
         XCloseDisplay( p_display );
diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c
index bacea024cd..156fa27336 100644
--- a/modules/codec/rawvideo.c
+++ b/modules/codec/rawvideo.c
@@ -108,6 +108,10 @@ static int OpenDecoder( vlc_object_t *p_this )
         case VLC_FOURCC('R','V','1','5'):
             break;
 
+        case VLC_FOURCC('y','v','1','2'):
+            p_dec->fmt_in.i_codec = VLC_FOURCC('Y','V','1','2');
+            break;
+
         default:
             return VLC_EGENERIC;
     }
diff --git a/modules/control/http.c b/modules/control/http.c
index 84d0373272..2d57d93084 100644
--- a/modules/control/http.c
+++ b/modules/control/http.c
@@ -146,8 +146,7 @@ static int uri_test_param( char *psz_uri, const char *psz_name );
 static void uri_decode_url_encoded( char *psz );
 
 static char *Find_end_MRL( char *psz );
-
-static playlist_item_t * parse_MRL( intf_thread_t * , char *psz );
+static playlist_item_t *parse_MRL( intf_thread_t * , char *psz );
 
 /*****************************************************************************
  *
@@ -3291,7 +3290,7 @@ static char *Find_end_MRL( char *psz )
  * create an item with all information in it, and return the item.
  * return NULL if there is an error.
  **********************************************************************/
-playlist_item_t * parse_MRL( intf_thread_t *p_intf, char *psz )
+static playlist_item_t *parse_MRL( intf_thread_t *p_intf, char *psz )
 {
     char **ppsz_options = NULL;
     char *mrl;
@@ -3395,11 +3394,8 @@ playlist_item_t * parse_MRL( intf_thread_t *p_intf, char *psz )
         }
     }
 
-    for( i = 0 ; i < i_options ; i++ )
-    {
-        free( ppsz_options[i] );
-    }
-    free( ppsz_options );
+    for( i = 0; i < i_options; i++ ) free( ppsz_options[i] );
+    if( i_options ) free( ppsz_options );
 
     return p_item;
 }
diff --git a/src/input/input.c b/src/input/input.c
index bcefedca52..fd3bcc70b6 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -620,7 +620,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
             p_input->p_sout = sout_NewInstance( p_input, psz );
             if( p_input->p_sout == NULL )
             {
-                msg_Err( p_input, "cannot start stream output instance," \
+                msg_Err( p_input, "cannot start stream output instance, " \
                                   "aborting" );
                 free( psz );
                 return VLC_EGENERIC;
diff --git a/src/interface/interface.c b/src/interface/interface.c
index bfb781777c..91f62a7fce 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -163,8 +163,9 @@ int intf_RunThread( intf_thread_t *p_intf )
         [VLCApplication sharedApplication];
     }
 
-    if( p_intf->b_block && ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) ||
-                             !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) )
+    if( p_intf->b_block &&
+        ( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) ||
+          !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) )
     {
         /* VLC in normal primary interface mode */
         RunInterface( p_intf );
-- 
GitLab