Conflicts:

	src/control/media_player.c

var_Change(VLC_VAR_GETCHOICES). The memory was freed by a call to
var_Change(VLC_VAR_FREELIST). That's not a good idea as we were doing a lookup
just to free some memory.

Conflicts:
	modules/video_filter/extract.c
	modules/video_filter/marq.c
	projects/mozilla/control/npolibvlc.cpp
	src/control/video.c

This also 'fixes' RTSP playback crashes (#2742)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

macosx: fixed menubar appearance in fullscreen mode by partially reverting [46c93c9c]

There is no 64bit-save aka non-Carbon replacement for this feature yet.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

macosx: fixed menubar appearance in fullscreen mode by partially reverting [46c93c9c]

There is no 64bit-save aka non-Carbon replacement for this feature yet.

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

This also 'fixes' RTSP playback crashes (#2742)

You don't want random web pages listing, say, the content of your
hard drive (file/xspf-open://C:/ ?). For debugging purpose, the standard
error from Mozilla is probably better than Javascript anyway, not to
mention that the libvlc logging APi is really brain-damaged.

for the strucure).

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Signed-off-by: JP Dinger <jpd@videolan.org>

deallocated).

Revert "zip access: fix #2467. Now it's able to open files with non ASCII names, but can't open files with non ASCII names inside of the zip file"

This reverts commit e3d08b79.

zip access: fix #2467. Now it's able to open files with non ASCII names, but can't open files with non ASCII names inside of the zip file

Indeed, giving a NULL to var_Change(VLC_VAR_SETSTRING) will lead to a crash the
next time this variable is used.

But well, fine distros should upgrade their minor libQt.