Merge branch '0.9-bugfix' of git@git.videolan.org:vlc into 0.9-bugfix

NEWS

-Changes between 0.9.3 and 0.9.4:
+Changes between 0.9.4 and 0.9.5-git:
 ------------------------------------
+
+
+Changes between 0.9.3 and 0.9.4:
+--------------------------------
 Various bugfixes:
  * Crashes fixed in ogg, vobsub, dvdread
  * Fixes several memory leaks.
@@ -14,7 +18,7 @@ Windows port:
 
 
 Changes between 0.9.2 and 0.9.3:
-------------------------------------
+--------------------------------
 
 Various bugfixes:
  * Fixed DTS channel order on 5.1 systems

configure.ac

 dnl Autoconf settings for vlc
 
-AC_INIT(vlc, 0.9.4)
+AC_INIT(vlc, 0.9.5-git)
 VERSION_MAJOR="0"
 VERSION_MINOR="9"
-VERSION_REVISION="4"
-VERSION_EXTRA=""
+VERSION_REVISION="5"
+VERSION_EXTRA="-git"
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Grishenko"

modules/access/mmap.c

@@ -58,8 +58,11 @@ vlc_module_begin();
     set_capability ("access", 52);
     add_shortcut ("file");
     set_callbacks (Open, Close);
-
+#ifdef __APPLE__
+    add_bool ("file-mmap", false, NULL,
+#else
     add_bool ("file-mmap", true, NULL,
+#endif
               FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true);
 vlc_module_end();
 

modules/access/rtmp/rtmp_amf_flv.c

@@ -1450,6 +1450,7 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
     return;
 
 error:
+    free( string );
     free( tmp_rtmp_packet->body->body );
     free( tmp_rtmp_packet->body );
     free( tmp_rtmp_packet );

modules/demux/playlist/b4s.c

@@ -98,7 +98,7 @@ static int Demux( demux_t *p_demux )
 
     psz_elname = stream_ReadLine( p_demux->s );
     free( psz_elname );
-    psz_elname = 0;
+    psz_elname = NULL;
 
     p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
     if( !p_xml_reader ) return -1;
@@ -142,7 +142,7 @@ static int Demux( demux_t *p_demux )
         free( psz_elname );
         return -1;
     }
-    free( psz_elname ); psz_elname = 0;
+    free( psz_elname ); psz_elname = NULL;
 
     // Read the attributes
     while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
@@ -294,6 +294,8 @@ static int Demux( demux_t *p_demux )
         msg_Warn( p_demux, "error while parsing data" );
     }
 
+   free( psz_elname );
+
     HANDLE_PLAY_AND_RELEASE;
     return 0; /* Needed for correct operation of go back */
 }

modules/meta_engine/taglib.cpp

@@ -409,7 +409,8 @@ vlc_meta_Set##bar( p_meta, p_t->toString().toCString(true))
         }
     }
 
-#define SET( foo, bar ) vlc_meta_Set##foo( p_meta, p_tag->bar ().toCString(true))
+#define SET( foo, bar ) if( !p_tag->bar ().isNull() && !p_tag->bar ().isEmpty() ) \
+        vlc_meta_Set##foo( p_meta, p_tag->bar ().toCString(true))
 #define SETINT( foo, bar ) { \
         char psz_tmp[10]; \
         snprintf( (char*)psz_tmp, 10, "%d", p_tag->bar() ); \