Merge branch 1.0-bugfix
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 20 May 2009 16:46:41 +0000 (19:46 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 20 May 2009 16:46:41 +0000 (19:46 +0300)
Conflicts:
modules/video_filter/extract.c
modules/video_filter/marq.c
projects/mozilla/control/npolibvlc.cpp
src/control/video.c

36 files changed:
1  2 
NEWS
modules/access/v4l2.c
modules/audio_filter/spatializer/spatializer.cpp
modules/codec/subtitles/subsdec.c
modules/demux/rawaud.c
modules/demux/ts.c
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/qt4.cpp
modules/misc/rtsp.c
modules/stream_out/transcode.c
modules/video_filter/adjust.c
modules/video_filter/alphamask.c
modules/video_filter/bluescreen.c
modules/video_filter/crop.c
modules/video_filter/erase.c
modules/video_filter/extract.c
modules/video_filter/gradient.c
modules/video_filter/logo.c
modules/video_filter/marq.c
modules/video_filter/mosaic.c
modules/video_filter/motionblur.c
modules/video_filter/osdmenu.c
modules/video_filter/postproc.c
modules/video_filter/rotate.c
modules/video_filter/sharpen.c
modules/video_output/msw/direct3d.c
modules/video_output/x11/xcommon.c
projects/mozilla/control/npolibvlc.cpp
projects/mozilla/test.html
projects/mozilla/vlcplugin.cpp
src/control/media_player.c
src/control/video.c
src/playlist/playlist_internal.h
src/playlist/services_discovery.c
src/video_output/video_output.c

diff --cc NEWS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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,
Simple merge
Simple merge
@@@ -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 );
  }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
 -}
Simple merge
Simple merge
Simple merge