VLC media player

lp:vlc/2.0

Created by Benjamin Drung on 2013-11-26 and last modified on 2014-03-26

This branch contains a bzr import of VLC's 2.0 maintenance branch from https://git.videolan.org/?p=vlc/vlc-2.0.git

Submodules in the bindings/ directory are not imported due to bug #402814. The script from lp:~videolan/vlc/bzr-import is used (on Ubuntu 14.04) to import the git repository to bzr.

Please do not push to this branch, because the next bzr import will overwrite any changes.

Get this branch:: bzr branch lp:vlc/2.0

Members of Videolan can upload to this branch. Log in for directions.

Branch merges

No branches dependent on this one.

Related bugs

Link a bug report

Related blueprints

Branch information

Owner:: Videolan

Project:: VLC media player

Status:: Mature

Recent revisions

49189. By David Fuhrmann <email address hidden> on 2014-03-26

macosx: do not handle triple clicks explicitely

refs #11061

(cherry picked from commit c877b353969c78b7e98b71a8e5cdf0013ec03826)
Signed-off-by: Felix Paul Kühne <email address hidden>

Conflicts:
modules/gui/macosx/VideoView.m

49188. By Jerome Forissier <email address hidden> on 2014-03-04

macosx: package libvlc_version.h, not libvlc_version.h.in.

Copy LibVLC headers from the installation directory: $(prefix)/include
rather than from the source directory, where the version file is still
unprocessed.

Signed-off-by: Felix Paul Kühne <email address hidden>
(cherry picked from commit 3c9463627d55d5e3f21f26eada40eaa137d8eca5)

49187. By Felix Paul Kühne on 2014-03-04

contrib/gnutls: add security patches

49186. By Felix Paul Kühne on 2014-02-11

configure: bump version and copyright years

49185. By Felix Paul Kühne on 2014-02-11

Finalize NEWS

49184. By Felix Paul Kühne on 2014-02-11

Live555: fix compilation with current library version

49183. By Felix Paul Kühne on 2014-02-11

extras: update automake

49182. By Felix Paul Kühne on 2014-02-11

contrib/modplug: download from ganesh instead of SF since this is way more reliable

(cherry picked from commit 4d794d1e082adcede425687a5166e2713b4d3c45)

49181. By Felix Paul Kühne on 2014-02-11

contrib/modplug: remove patch merged upstream

(cherry picked from commit 2cf63b81629d7b69d76d65dc60f3c49a27bd199c)

49180. By Felix Paul Kühne on 2014-02-11

contrib: update modplug

(cherry picked from commit 749cbea930c2ec18cb3e2df9ee7ad581f81c3603)

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

This branch contains Public information

Everyone can see this information.

Subscribers

Videolan