Hi,
On Sun, Sep 15, 2013 at 01:15:53PM -0700, Minh Ngo wrote:
avmedia/source/vlc/vlcmanager.cxx | 8 +++-----
avmedia/source/vlc/wrapper/SymbolLoader.hxx | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit bd8f84ceb36954496fd9f053436b0c4a8a5c38db
Author: Minh Ngo <nlminhtl@gmail.com>
Date: Sun Sep 15 23:13:19 2013 +0300
Avmedia/VLC: Falling back to gstreamer if libvlc is not found.
Change-Id: I8d4e3cded0fc8c26a27505b5d51806bbcdeecc93
I think this is bad. If I say vlc I want vlc. You don't (especially with
dynamic loading) not fall back to something other (which might not even exist[1])
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -36,7 +36,7 @@ struct ApiMap
namespace
{
#if defined( UNX )
- const char LibName[] = "libvlc.so.5";
+ const char LibName[] = "libvlc.so";
#elif defined( MACOSX )
const char LibName[] = "/Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib";
#elif defined( WNT )
This
a) is not mentioned in the commit message
b) will make vlc not work on almost all Linux systems as they weill have libvlc installed but
not "libvlc.so" which is usually in the development package (Debian: libvlc-dev) instead of
the library package (libvlc5). Thus you really want to load based on the correct SONAME...[2]
No idea on Mac OS, probably VLC will install everything, so it wouldn't matter much, but...
Regards,
Rene
[1] From 3.2 on I have libreoffice-avmedia-backend-gstreamer and -avmedia-backend-vlc
packages and the admin can choose.
That also means that the first one might not even be installed
[2] Which I'd add as a local patch anyways if this is not reverted
Context
- Re: [Libreoffice-commits] core.git: avmedia/source · Rene Engelhard
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.