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)
commit7f12470415d98e9e0ac725f2bb96b5fa74ef27f1
tree58f038a9edf896185b3e0f7abebd6f64e19aa4fe
parenta516ab36c1891b7afbc7531ee0cdee480e36c631
parent63980c43dd72fe0f6909f61304a5384743e452ee
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
36 files changed:
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