Yes, this code is weird, but well

If the version header is there, the main one should be too.

works around the lack of a recent enough libebml/libmatroska in Debian

the version number hasn't been updated

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Spotted by Christoph Miebach Christoph dot Miebach __ web dot de

patch sent upstream

This reverts commit 76003f0e,
which is not needed anymore.

This mostly reverts commit 8a497301.

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