This was broken in [3d5ff7dc]

Conflicts:

	src/input/input.c

I'm not sure that VLC can't still leak memory in this case...

Remove duplicate " :"

New features (audio and subtitles) added.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

- audio.count: give the number of available audio track
  - audio.description(int n): give the name of the n-th audio track
  - subtitle.count: give the number of available subtitle track
  - subtitle.description(int n): give the name of the n-th subtitle track
  - subtitle.track: get and set the subtitle track to show (similar as video.subtitle)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

- audio.count: give the number of available audio track
  - audio.description(int n): give the name of the n-th audio track
  - subtitle.count: give the number of available subtitle track
  - subtitle.description(int n): give the name of the n-th subtitle track
  - subtitle.track: get and set the subtitle track to show (similar as video.subtitle)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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.