mplayer, vlc: move into multimedia category

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>

package/Config.in

@@ -381,10 +381,6 @@ source "package/x11vnc/Config.in"
 source "package/xpdf/Config.in"
 source "package/xstroke/Config.in"
 source "package/xvkbd/Config.in"
-
-comment "Video libraries/codecs and applications"
-source "package/mplayer/Config.in"
-source "package/vlc/Config.in"
 endmenu
 
 menu "Compressors / decompressors"

package/multimedia/Config.in

@@ -10,6 +10,8 @@ source "package/multimedia/libsndfile/Config.in"
 source "package/multimedia/libvorbis/Config.in"
 source "package/multimedia/madplay/Config.in"
 source "package/multimedia/mpg123/Config.in"
+source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/speex/Config.in"
 source "package/multimedia/festival/Config.in"
+source "package/multimedia/vlc/Config.in"
 endmenu

package/mplayer/mplayer.mk → package/multimedia/mplayer/mplayer.mk

@@ -22,7 +22,7 @@ $(DL_DIR)/$(MPLAYER_SOURCE):
 
 $(MPLAYER_DIR)/.unpacked: $(DL_DIR)/$(MPLAYER_SOURCE)
 	$(MPLAYER_CAT) $(DL_DIR)/$(MPLAYER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MPLAYER_DIR) package/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\*
+	toolchain/patch-kernel.sh $(MPLAYER_DIR) package/multimedia/mplayer/ mplayer-$(MPLAYER_VERSION)\*.patch\*
 	$(CONFIG_UPDATE) $(MPLAYER_DIR)
 	touch $@
 

package/vlc/vlc.mk → package/multimedia/vlc/vlc.mk

@@ -14,5 +14,5 @@ VLC_CONF_OPT =
 
 VLC_DEPENDENCIES = uclibc
 
-$(eval $(call AUTOTARGETS,package,vlc))
+$(eval $(call AUTOTARGETS,package/multimedia,vlc))