Created by Benjamin Drung on 2013-11-26 and last modified on 2016-05-16

The import has stopped and this branch is abandoned. Please use the git repository instead: https://code.launchpad.net/~videolan/vlc/+git/vlc

Old description:

This branch contains a bzr import of VLC's master branch from https://git.videolan.org/?p=vlc.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
Members of Videolan can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

VLC media player

Recent revisions

64193. By Hugo Beauzée-Luyssen on 2016-04-12

configure.ac: Use AC_PATH_PROGS for luac

64192. By Benoit du Payrat <email address hidden> on 2016-04-12

Qt: Apply nothing if no change was made in toolbar custom

Fix #15011

Signed-off-by: Hugo Beauzée-Luyssen <email address hidden>

64191. By Thomas Guillem <email address hidden> on 2016-04-12

keystore/file: fix error path

64190. By Sean McG on 2016-04-12

keystore/file: use POSIX file locking when flock() is unavailable

Additionally, remove the unlock call as fclose() will drop
the lock for us.

Signed-off-by: Thomas Guillem <email address hidden>

64189. By Petri Hintukainen <email address hidden> on 2016-04-12

bluray: fix chapter mark time offsets

64188. By Felix Paul Kühne on 2016-04-12

contrib/libdsm: update hash for updated 0.2.2 tarball

64187. By Thomas Guillem <email address hidden> on 2016-04-12

dsm: fix smb_session_is_guest check

64186. By Felix Paul Kühne on 2016-04-12

contrib/libdsm: update to version 0.2.2

64185. By Francois Cartegnie on 2016-04-12

demux: mp4: add support for forced tx3g spu (fix #16803)

64184. By Thomas Guillem <email address hidden> on 2016-04-12

libvlc: media: deprecate libvlc_Buffering state

This state was never set or used. If it was set, it would have overridden the
media state since a media can be buffering while opening or during playback
(while seeking).

PS: Listen to the libvlc_MediaPlayerBuffering event if you want to know if a
media player is buffering.

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.