Merge branch 1.0-bugfix

Conflicts:
	modules/video_filter/extract.c
	modules/video_filter/marq.c
	projects/mozilla/control/npolibvlc.cpp
	src/control/video.c

diff --cc NEWS
Simple merge

diff --cc modules/access/v4l2.c
Simple merge

diff --cc modules/audio_filter/spatializer/spatializer.cpp
Simple merge

diff --cc modules/codec/subtitles/subsdec.c
Simple merge

diff --cc modules/demux/rawaud.c
Simple merge

diff --cc modules/demux/ts.c
Simple merge

diff --cc modules/gui/qt4/main_interface.cpp
Simple merge

diff --cc modules/gui/qt4/main_interface.hpp
Simple merge

diff --cc modules/gui/qt4/qt4.cpp
Simple merge

diff --cc modules/misc/rtsp.c
Simple merge

diff --cc modules/stream_out/transcode.c
Simple merge

diff --cc modules/video_filter/adjust.c
Simple merge

diff --cc modules/video_filter/alphamask.c
Simple merge

diff --cc modules/video_filter/bluescreen.c
Simple merge

diff --cc modules/video_filter/crop.c
Simple merge

diff --cc modules/video_filter/erase.c
Simple merge

diff --cc modules/video_filter/extract.c
index 3364d4dc82ff1d144ad0d4bde61cc36075bf9652,c061884ac2cf26ad6ec8934c408492e04fe0e0c0..11551f7a82efac4d46a4e71cbb8f774ca9fc389b
--- 1/modules/video_filter/extract.c
--- 2/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@@ -177,12 -185,14 +183,13 @@@ static picture_t *Filter( filter_t *p_f
          return NULL;
      }
  
+     vlc_mutex_lock( &p_sys->lock );
      switch( p_pic->format.i_chroma )
      {
 -        case VLC_FOURCC('I','4','2','0'):
 -        case VLC_FOURCC('I','Y','U','V'):
 -        case VLC_FOURCC('J','4','2','0'):
 -        case VLC_FOURCC('Y','V','1','2'):
 +        case VLC_CODEC_I420:
 +        case VLC_CODEC_J420:
 +        case VLC_CODEC_YV12:
-             switch( p_filter->p_sys->i_color )
+             switch( p_sys->i_color )
              {
                  case RED:
                      get_red_from_yuv420( p_pic, p_outpic,

diff --cc modules/video_filter/gradient.c
Simple merge

diff --cc modules/video_filter/logo.c
Simple merge

diff --cc modules/video_filter/marq.c
index 56299b785e61b2d1538dc6b7f2c83819e88d1869,ce627d124410fad85571c6e84cc2e97097ad3173..f993907d4d1445ea9ee7847d10ac268484ec449f
--- 1/modules/video_filter/marq.c
--- 2/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@@ -257,6 -259,8 +257,8 @@@ static void DestroyFilter( vlc_object_
      DEL_VAR( "marq-size" );
  
      vlc_mutex_destroy( &p_sys->lock );
 -    free( p_sys->p_style );
++    text_style_Delete( p_sys->p_style );
+     free( p_sys->psz_marquee );
      free( p_sys );
  }
  

diff --cc modules/video_filter/mosaic.c
Simple merge

diff --cc modules/video_filter/motionblur.c
Simple merge

diff --cc modules/video_filter/osdmenu.c
Simple merge

diff --cc modules/video_filter/postproc.c
Simple merge

diff --cc modules/video_filter/rotate.c
Simple merge

diff --cc modules/video_filter/sharpen.c
Simple merge

diff --cc modules/video_output/msw/direct3d.c
Simple merge

diff --cc modules/video_output/x11/xcommon.c
Simple merge

diff --cc projects/mozilla/control/npolibvlc.cpp
Simple merge

diff --cc projects/mozilla/test.html
Simple merge

diff --cc projects/mozilla/vlcplugin.cpp
Simple merge

diff --cc src/control/media_player.c
Simple merge

diff --cc src/control/video.c
index fd62e005a72deb7e165116d887fa2994e2d7b3f9,939ed5941783135e87d7189cc77e598edf4c2c09..f43a81556d1a0f3e71404b1695f70e6736508ce0
--- 1/src/control/video.c
--- 2/src/control/video.c
+++ b/src/control/video.c
@@@ -578,5 -737,19 +586,8 @@@ void libvlc_video_set_track( libvlc_med
          }
      }
      libvlc_exception_raise( p_e, "Video track out of range" );
+ 
+ end:
+     var_Change( p_input_thread, "video-es", VLC_VAR_FREELIST, &val_list, NULL );
      vlc_object_release( p_input_thread );
  }
 -
 -int libvlc_video_destroy( libvlc_media_player_t *p_mi,
 -                          libvlc_exception_t *p_e )
 -{
 -    vout_thread_t *p_vout = GetVout( p_mi, p_e );
 -    vlc_object_detach( p_vout );
 -    vlc_object_release( p_vout );
 -    vlc_object_release( p_vout );
 -
 -    return 0;
 -}

diff --cc src/playlist/playlist_internal.h
Simple merge

diff --cc src/playlist/services_discovery.c
Simple merge

diff --cc src/video_output/video_output.c
Simple merge