From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 20 May 2009 16:46:41 +0000 (+0300)
Subject: Merge branch 1.0-bugfix
X-Git-Tag: 1.1.0-ff~5867
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7f12470415d98e9e0ac725f2bb96b5fa74ef27f1;p=vlc

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
---

7f12470415d98e9e0ac725f2bb96b5fa74ef27f1
diff --cc modules/video_filter/extract.c
index 3364d4dc82,c061884ac2..11551f7a82
--- a/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/marq.c
index 56299b785e,ce627d1244..f993907d4d
--- a/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 src/control/video.c
index fd62e005a7,939ed59417..f43a81556d
--- a/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;
 -}