diff options
| -rw-r--r-- | avmedia/source/vlc/vlcframegrabber.cxx | 10 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcmanager.cxx | 8 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcplayer.cxx | 1 |
3 files changed, 4 insertions, 15 deletions
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index 7a742e976e1e..a28cf8aa86be 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -28,15 +28,12 @@ namespace const char * const VLC_ARGS[] = { "-Vdummy", - // "--ignore-config" "--demux", "ffmpeg", "--snapshot-format=png", "--ffmpeg-threads", /* Is deprecated in 2.1.0 */ - "--verbose=2", - "--no-audio"//, - //"--file-logging", - //"--logfile=C:/home/dev/log/vlc_log" + "--verbose=-1", + "--no-audio" }; } @@ -70,10 +67,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString const TimeValue timeout = {2, 0}; - //TODO: Fix this hang on Windows -#ifndef WNT condition.wait(&timeout); -#endif if ( !mPlayer.hasVout() ) { diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 370505d225b1..9894b731f743 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -29,14 +29,10 @@ namespace const ::rtl::OUString VLC_SERVICENAME = "com.sun.star.media.Manager_VLC"; const char * const VLC_ARGS[] = { - "-Vdummy", -#ifdef WNT "--demux", "ffmpeg", -#endif - "--verbose=2"//, - //"--file-logging", - //"--logfile=C:/home/dev/log/vlc_log" + "--no-mouse-events", + "--verbose=-1" }; } diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 8d546725d153..64ad897eaa9f 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -1,4 +1,3 @@ -#include <iostream> #include <boost/bind.hpp> #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> |