I think that's a good pattern to follow.
In this particular case, there was no bug however.

The original commit description is rather terse
  "ps demux: fix an issue in ps_pkt_read()"
so I don't really know what the "issue" is. But ps_pkt_size() really
made no sense as is.

This reverts commit d761cf6f.

Conflicts:

	modules/demux/ps.h

lua_extensions: no need to lock the object as we are inside a call to module need with a freshly created object.

separate path to ./configure and options
-> we can disable specific options for win64

It is not defined on windows 64

gecko-win32 -> gecko
build dirac
don't make ffmpeg depend on libvpx
don't build portaudio
patch x264 to link x264.exe with -liberty (debian's amd64 runtime hasn't getopt)
patch pthreads to link with libws2_32 instead of libwsock32

This patch adds encode support to the LPCM module; only the DVD variant for
now. It's not been tested with any other clients than VLC.

The rationale for this functionality is relatively simple -- LPCM is
currently the only low-latency codec that VLC supports and that can be
embedded in a TS stream. Longer-term support for other low-latency codecs
would be good, but if you're not particularly bandwidth-constrained and need
low latency, this is currently the best option I know of.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Paths for error message must be UTF-8; they were locale.
Paths for probing must be UTF-8 also, as vlc_fopen() does the
conversion to locale internally.

Paths given to msg_*() function must be UTF-8, not local.

schroedinger doesn't depend on orcc anymore

Force MAKEFLAGS=-j1

make sure they are copied only after all contribs have been built

as suggested by courmisch

Where X is the number of CPU detected on Linux, or 1
TODO: detection on BSD, OSX, etc...

helps when paths have a space in them (/c/Program Files/...)

This reverts commit 5ff88fe4.
Patch applied upstream

patch sent upstream