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

diff --git a/extras/contrib/src/Distributions/netbox3.mak b/extras/contrib/src/Distributions/netbox3.mak
index 2035c0244bfcd3e8ad777e45f678fa03b7cbb5f0..bf19df1a8def2208d332de9ade1ef92fd4970b7c 100644 (file)
--- a/extras/contrib/src/Distributions/netbox3.mak
+++ b/extras/contrib/src/Distributions/netbox3.mak
@@ -1,12 +1,12 @@
 #
 # Fine tune ffmpeg's capabiities for this system
 #
-FFMPEGCONF += --disable-encoders --disable-muxers --disable-demuxers --enable-demuxer=avi --enable-demuxer=avisynth --enable-demuxer=gif --enable-demuxer=h261 --enable-demuxer=h263 --enable-demuxer=h264 --enable-demuxer=image2 --enable-demuxer=image2pipe --enable-demuxer=m4v --enable-demuxer=mjpg --enable-demuxer=mov --enable-demuxer=mpegps --enable-demuxer=mpegvideo --enable-demuxer=yuv4mpegpipe --disable-parsers --enable-parser=mpeg4video --enable-parser=vc1 --enable-parser=mjpeg --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=pnm --enable-parser=h264 --enable-parser=h263 --enable-parser=h264 --disable-decoders --enable-decoder=h261 --enable-decoder=h263 --enable-decoder=h263i --enable-decoder=h264 --enable-decoder=huffyuv --enable-decoder=idcin --enable-decoder=jpegls --enable-decoder=mjpeg --enable-decoder=mjpegb --enable-decoder=mmvideo --enable-decoder=mpeg1video --enable-decoder=mpeg2video --enable-decoder=mpeg4 --enable-decoder=mpeg4aac --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=msvideo1 --enable-decoder=png --enable-decoder=rv10 --enable-decoder=rv20 --enable-decoder=vc1 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=zlib --enable-decoder=gif --disable-protocols --enable-encoder=bmp --enable-encoder=gif --enable-encoder=jpegls --enable-encoder=mjpeg --enable-encoder=png --enable-muxer=image2 --enable-muxer=image2pipe --enable-muxer=mjpeg
+FFMPEGCONF += --enable-encoders --disable-muxers --disable-demuxers --disable-demuxer=dv1394 --enable-demuxer=avi --enable-demuxer=avisynth --enable-demuxer=gif --enable-demuxer=h261 --enable-demuxer=h263 --enable-demuxer=h264 --enable-demuxer=m4v --enable-demuxer=mjpg --enable-demuxer=mov --enable-demuxer=mpegps --enable-demuxer=mpegvideo --enable-demuxer=yuv4mpegpipe --disable-parsers --enable-parser=mpeg4video --enable-parser=vc1 --enable-parser=mjpeg --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=pnm --enable-parser=h264 --enable-parser=h263 --enable-parser=h264 --disable-decoders --enable-decoder=h261 --enable-decoder=h263 --enable-decoder=h263i --enable-decoder=h264 --enable-decoder=huffyuv --enable-decoder=idcin --enable-decoder=jpegls --enable-decoder=mjpeg --enable-decoder=mjpegb --enable-decoder=mmvideo --enable-decoder=mpeg1video --enable-decoder=mpeg2video --enable-decoder=mpeg4 --enable-decoder=mpeg4aac --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=msvideo1 --enable-decoder=png --enable-decoder=bmp --enable-decoder=rv10 --enable-decoder=rv20 --enable-decoder=vc1 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=zlib --enable-decoder=gif --enable-decoder=tiff --disable-protocols --enable-encoder=bmp --enable-encoder=gif --enable-encoder=jpegls --enable-encoder=mjpeg --enable-encoder=png --enable-encoder=huffyuv --enable-muxer=mjpeg --enable-encoder=zlib
 
 #
 # NetBOX Linux rules
 #
 all: .iconv .intl .freetype .zlib \
        .ffmpeg .live .xml \
-       .dvbpsi .png
+       .dvbpsi
 

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 5e03e91906d6eaba0720190473d828dd618a699e..994d828a23ec9bdd68f228447326bdef271a4815 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -544,6 +544,8 @@ enum input_state_e
     ERROR_S
 };
 
+static const char *ppsz_input_state[] = { N_("Initializing"), N_("Opening"), N_("Buffer"), N_("Play"), N_("Pause"), N_("Stop"), N_("Error") }
+
 /* "rate" default, min/max
  * A rate below 1000 plays the movie faster,
  * A rate above 1000 plays the movie slower.

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 7f5477642075b1fe63cf7c60d17b8a381ee616ee..8bf1f02deb0ed8a1f548d13dc3a0b22b48bbdc4f 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -548,21 +548,21 @@ static void Run( intf_thread_t *p_intf )
                 (p_playlist->status.i_status == PLAYLIST_STOPPED) )
             {
                 p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
-                msg_rc( STATUS_CHANGE "( stop state: 0 )" );
+                msg_rc( STATUS_CHANGE "( stop state: 5 )" );
             }
             else if(
                 (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
                 (p_playlist->status.i_status == PLAYLIST_RUNNING) )
             {
                 p_intf->p_sys->i_last_state = p_playlist->status.i_status;
-                msg_rc( STATUS_CHANGE "( play state: 1 )" );
+                 msg_rc( STATUS_CHANGE "( play state: 3 )" );
             }
             else if(
                 (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
                 (p_playlist->status.i_status == PLAYLIST_PAUSED) )
             {
                 p_intf->p_sys->i_last_state = p_playlist->status.i_status;
-                msg_rc( STATUS_CHANGE "( pause state: 2 )" );
+                msg_rc( STATUS_CHANGE "( pause state: 4 )" );
             }
             vlc_mutex_unlock( &p_playlist->object_lock );
         }
@@ -999,7 +999,9 @@ static int StateChanged( vlc_object_t *p_this, char const *psz_cmd,
             default:
                 cmd[0] = '\0';
             } /* var_GetInteger( p_input, "state" )  */
-            msg_rc( STATUS_CHANGE "( %s state: %d )", &cmd[0], newval.i_int );
+            msg_rc( STATUS_CHANGE "( %s state: %d ): %s",
+                                  &cmd[0], newval.i_int,
+                                  ppsz_input_state[ newval.i_int ] );
             vlc_object_release( p_playlist );
         }
         vlc_object_release( p_input );
@@ -1479,16 +1481,16 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd,
             switch( p_playlist->status.i_status )
             {
                 case PLAYLIST_STOPPED:
-                    msg_rc( STATUS_CHANGE "( stop state: 0 )" );
+                    msg_rc( STATUS_CHANGE "( stop state: 5 )" );
                     break;
                 case PLAYLIST_RUNNING:
-                    msg_rc( STATUS_CHANGE "( play state: 1 )" );
+                    msg_rc( STATUS_CHANGE "( play state: 3 )" );
                     break;
                 case PLAYLIST_PAUSED:
-                    msg_rc( STATUS_CHANGE "( pause state: 2 )" );
+                    msg_rc( STATUS_CHANGE "( pause state: 4 )" );
                     break;
                 default:
-                    msg_rc( STATUS_CHANGE "( state unknown )" );
+                    msg_rc( STATUS_CHANGE "( unknown state: -1 )" );
                     break;
             }
             PL_UNLOCK;
@@ -1715,7 +1717,9 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd,
     }
     else  if( !strcmp( psz_cmd, "snapshot" ) )
     {
-        i_error = var_Set( p_vout, psz_variable, newval );
+        vlc_value_t val;
+        val.b_bool = VLC_TRUE;
+        i_error = var_Set( p_vout, psz_variable, val );
     }
     else
     {

diff --git a/src/misc/stats.c b/src/misc/stats.c
index a922fe893c397dfbad2397a829e9b534485d5161..e8f4bdd2dd302f6c1891126048af0ad7c6160aa5 100644 (file)
--- a/src/misc/stats.c
+++ b/src/misc/stats.c
@@ -62,6 +62,7 @@ counter_t * __stats_CounterCreate( vlc_object_t *p_this,
     counter_t *p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
     (void)p_this;
 
+    if( !p_counter ) return NULL;
     p_counter->i_compute_type = i_compute_type;
     p_counter->i_type = i_type;
     p_counter->i_samples = 0;

diff --git a/test/dynamicoverlay/.gitignore b/test/dynamicoverlay/.gitignore
new file mode 100644 (file)
index 0000000..c68b2a2
--- /dev/null
+++ b/test/dynamicoverlay/.gitignore
@@ -0,0 +1 @@
+overlay-test