Conflicts:
	extras/contrib/Makefile
	extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
	extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
	extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
	extras/package/macosx/vlc.xcodeproj/project.pbxproj
	modules/gui/qt4/dialogs/external.cpp
	projects/mozilla/vlcshell.cpp
	src/control/event.c
	src/control/media_list_player.c
	src/control/media_player.c

Do not forward-port

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

Brought to you by M2X. Needless to mention that this is complete 100%
crap. Depending cases, it's not either ignoring errors (and e.g. leaking
memory which is very stupid in OOM situations), or worse, introducing
bugs in places where realloc() was used correctly.

And exactly one day after I WARNED EXPLICITLY AGAINST DOING THIS.

This reverts commit ec5d8611.

Fix turns out to not be quite a fix.

This reverts commit ba8f1f35.

python bindings: fix setup.py to use 'pkg-config libvlc' instead of the old vlc-config (patch by <kwizart@gmail.com>).

live555 now supports DV (DIF, video/dv) format.  Pass it through to
the DV demuxer.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Do not update buffer size if realloc() fails.

Assert that buffer was not overflowed rather than merely warning.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 13b7d257)

Reverted change to libvlc_event_manger_release().

(cherry picked from commit 15463713)

(cherry picked from commit 3fa0d24d)

(cherry picked from commit 51695589)