48 files changed, 38 insertions, 38 deletions
diff --git a/package/Config.in b/package/Config.in
index a2ff72af9..203767d33 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -268,8 +268,8 @@ source "package/wipe/Config.in"
 source "package/xfsprogs/Config.in"
 endmenu
 
-# Audio support
-source "package/audio/Config.in"
+# Audio/Video support
+source "package/multimedia/Config.in"
 
 menu "Graphic libraries and applications (graphic/text)"
 comment "text rendering libraries"
diff --git a/package/audio/Config.in b/package/audio/Config.in
deleted file mode 100644
index 1a2bbe0fb..000000000
--- a/package/audio/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-menu "Audio libraries and applications"
-source "package/audio/alsa-lib/Config.in"
-source "package/audio/alsa-utils/Config.in"
-source "package/audio/asterisk/Config.in"
-source "package/audio/aumix/Config.in"
-source "package/audio/libid3tag/Config.in"
-source "package/audio/libmad/Config.in"
-source "package/audio/libogg/Config.in"
-source "package/audio/libsndfile/Config.in"
-source "package/audio/libvorbis/Config.in"
-source "package/audio/madplay/Config.in"
-source "package/audio/mpg123/Config.in"
-source "package/audio/speex/Config.in"
-source "package/audio/festival/Config.in"
-endmenu
diff --git a/package/audio/audio.mk b/package/audio/audio.mk
deleted file mode 100644
index 30f43b1dc..000000000
--- a/package/audio/audio.mk
+++ /dev/null
@@ -1 +0,0 @@
-include package/audio/*/*.mk
diff --git a/package/audio/festival/festival.mk b/package/audio/festival/festival.mk
deleted file mode 100644
index 28428880f..000000000
--- a/package/audio/festival/festival.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-include package/audio/festival/speech-tools/speech-tools.mk
-include package/audio/festival/festival/festival.mk
-include package/audio/festival/voices/festvox.mk
-include package/audio/festival/lexicons/festlex.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
new file mode 100644
index 000000000..acbb2c43a
--- /dev/null
+++ b/package/multimedia/Config.in
@@ -0,0 +1,15 @@
+menu "Audio and video libraries and applications"
+source "package/multimedia/alsa-lib/Config.in"
+source "package/multimedia/alsa-utils/Config.in"
+source "package/multimedia/asterisk/Config.in"
+source "package/multimedia/aumix/Config.in"
+source "package/multimedia/libid3tag/Config.in"
+source "package/multimedia/libmad/Config.in"
+source "package/multimedia/libogg/Config.in"
+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/speex/Config.in"
+source "package/multimedia/festival/Config.in"
+endmenu
diff --git a/package/audio/alsa-lib/Config.in b/package/multimedia/alsa-lib/Config.in
index 3077d36b1..3077d36b1 100644
--- a/package/audio/alsa-lib/Config.in
+++ b/package/multimedia/alsa-lib/Config.in
diff --git a/package/audio/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 21953cb0c..78b0bf217 100644
--- a/package/audio/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -26,7 +26,7 @@ $(DL_DIR)/$(ALSA_LIB_SOURCE):
 
 $(ALSA_LIB_DIR)/.unpacked: $(DL_DIR)/$(ALSA_LIB_SOURCE)
 	$(ALSA_LIB_CAT) $(DL_DIR)/$(ALSA_LIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ALSA_LIB_DIR) package/audio/alsa-lib/ alsa-lib-$(ALSA_LIB_VERSION)\*.patch*
+	toolchain/patch-kernel.sh $(ALSA_LIB_DIR) package/multimedia/alsa-lib/ alsa-lib-$(ALSA_LIB_VERSION)\*.patch*
 	$(CONFIG_UPDATE) $(ALSA_LIB_DIR)
 	touch $@
 
diff --git a/package/audio/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in
index b7304f397..b7304f397 100644
--- a/package/audio/alsa-utils/Config.in
+++ b/package/multimedia/alsa-utils/Config.in
diff --git a/package/audio/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 094b0ec02..65d3413cd 100644
--- a/package/audio/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -16,7 +16,7 @@ $(DL_DIR)/$(ALSA_UTILS_SOURCE):
 
 $(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE)
 	$(ALSA_UTILS_CAT) $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/audio/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch\*
+	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch\*
 	$(CONFIG_UPDATE) $(ALSA_UTILS_DIR)
 	touch $@
 
diff --git a/package/audio/asterisk/Config.in b/package/multimedia/asterisk/Config.in
index e20eb5ac2..e20eb5ac2 100644
--- a/package/audio/asterisk/Config.in
+++ b/package/multimedia/asterisk/Config.in
diff --git a/package/audio/asterisk/asterisk.mk b/package/multimedia/asterisk/asterisk.mk
index 5c1d4baf8..5ff70fbf6 100644
--- a/package/audio/asterisk/asterisk.mk
+++ b/package/multimedia/asterisk/asterisk.mk
@@ -15,7 +15,7 @@ $(DL_DIR)/$(ASTERISK_SOURCE):
 
 $(ASTERISK_DIR)/.source: $(DL_DIR)/$(ASTERISK_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(ASTERISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/audio/asterisk/ asterisk\*.patch
+	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/multimedia/asterisk/ asterisk\*.patch
 	touch $@
 
 $(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source
diff --git a/package/audio/asterisk/asterisk_no_res_ninit.patch b/package/multimedia/asterisk/asterisk_no_res_ninit.patch
index 1dff2f305..1dff2f305 100644
--- a/package/audio/asterisk/asterisk_no_res_ninit.patch
+++ b/package/multimedia/asterisk/asterisk_no_res_ninit.patch
diff --git a/package/audio/aumix/Config.in b/package/multimedia/aumix/Config.in
index 3d3208250..3d3208250 100644
--- a/package/audio/aumix/Config.in
+++ b/package/multimedia/aumix/Config.in
diff --git a/package/audio/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk
index 4ee7b0a0a..4ee7b0a0a 100644
--- a/package/audio/aumix/aumix.mk
+++ b/package/multimedia/aumix/aumix.mk
diff --git a/package/audio/festival/Config.in b/package/multimedia/festival/Config.in
index 4141e7a78..0c681d110 100644
--- a/package/audio/festival/Config.in
+++ b/package/multimedia/festival/Config.in
@@ -8,15 +8,15 @@ help
 if BR2_PACKAGE_FESTIVAL
 
 	menu "speech tools"
-		source "package/audio/festival/speech-tools/Config.in"
+		source "package/multimedia/festival/speech-tools/Config.in"
 	endmenu
 
 	menu "festival lexicons"
-		source "package/audio/festival/lexicons/Config.in"
+		source "package/multimedia/festival/lexicons/Config.in"
 	endmenu
 
 	menu "festival voices"
-		source "package/audio/festival/voices/Config.in"
+		source "package/multimedia/festival/voices/Config.in"
 	endmenu
 
 endif
diff --git a/package/multimedia/festival/festival.mk b/package/multimedia/festival/festival.mk
new file mode 100644
index 000000000..445dbc789
--- /dev/null
+++ b/package/multimedia/festival/festival.mk
@@ -0,0 +1,4 @@
+include package/multimedia/festival/speech-tools/speech-tools.mk
+include package/multimedia/festival/festival/festival.mk
+include package/multimedia/festival/voices/festvox.mk
+include package/multimedia/festival/lexicons/festlex.mk
diff --git a/package/audio/festival/festival/festival-1.96-beta-doc.patch b/package/multimedia/festival/festival/festival-1.96-beta-doc.patch
index 583cf6e56..583cf6e56 100644
--- a/package/audio/festival/festival/festival-1.96-beta-doc.patch
+++ b/package/multimedia/festival/festival/festival-1.96-beta-doc.patch
diff --git a/package/audio/festival/festival/festival-1.96-beta-etcsiteinit.patch b/package/multimedia/festival/festival/festival-1.96-beta-etcsiteinit.patch
index 8e21acede..8e21acede 100644
--- a/package/audio/festival/festival/festival-1.96-beta-etcsiteinit.patch
+++ b/package/multimedia/festival/festival/festival-1.96-beta-etcsiteinit.patch
diff --git a/package/audio/festival/festival/festival-1.96-beta-libdir.patch b/package/multimedia/festival/festival/festival-1.96-beta-libdir.patch
index b076ad947..b076ad947 100644
--- a/package/audio/festival/festival/festival-1.96-beta-libdir.patch
+++ b/package/multimedia/festival/festival/festival-1.96-beta-libdir.patch
diff --git a/package/audio/festival/festival/festival-1.96-beta-speechtools-dir.patch b/package/multimedia/festival/festival/festival-1.96-beta-speechtools-dir.patch
index 874d1f662..874d1f662 100644
--- a/package/audio/festival/festival/festival-1.96-beta-speechtools-dir.patch
+++ b/package/multimedia/festival/festival/festival-1.96-beta-speechtools-dir.patch
diff --git a/package/audio/festival/festival/festival.mk b/package/multimedia/festival/festival/festival.mk
index c5d9493d8..1762fcfa7 100644
--- a/package/audio/festival/festival/festival.mk
+++ b/package/multimedia/festival/festival/festival.mk
@@ -17,5 +17,5 @@ FESTIVAL_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX)
 
 FESTIVAL_DEPENDENCIES = uclibc alsa-lib speech-tools
 
-$(eval $(call AUTOTARGETS,package/audio/festival,festival))
+$(eval $(call AUTOTARGETS,package/multimedia/festival,festival))
 
diff --git a/package/audio/festival/lexicons/Config.in b/package/multimedia/festival/lexicons/Config.in
index 6d92883b3..6d92883b3 100644
--- a/package/audio/festival/lexicons/Config.in
+++ b/package/multimedia/festival/lexicons/Config.in
diff --git a/package/audio/festival/lexicons/festlex.mk b/package/multimedia/festival/lexicons/festlex.mk
index f5fdc9f76..f5fdc9f76 100644
--- a/package/audio/festival/lexicons/festlex.mk
+++ b/package/multimedia/festival/lexicons/festlex.mk
diff --git a/package/audio/festival/speech-tools/Config.in b/package/multimedia/festival/speech-tools/Config.in
index d8405bad3..d8405bad3 100644
--- a/package/audio/festival/speech-tools/Config.in
+++ b/package/multimedia/festival/speech-tools/Config.in
diff --git a/package/audio/festival/speech-tools/speech-tools-1.2.96-beta-install.patch b/package/multimedia/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
index 3cc47d344..3cc47d344 100644
--- a/package/audio/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
+++ b/package/multimedia/festival/speech-tools/speech-tools-1.2.96-beta-install.patch
diff --git a/package/audio/festival/speech-tools/speech-tools.mk b/package/multimedia/festival/speech-tools/speech-tools.mk
index e259a151b..c757bf8ff 100644
--- a/package/audio/festival/speech-tools/speech-tools.mk
+++ b/package/multimedia/festival/speech-tools/speech-tools.mk
@@ -16,5 +16,5 @@ SPEECH_TOOLS_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX)
 
 SPEECH_TOOLS_DEPENDENCIES = uclibc ncurses
 
-$(eval $(call AUTOTARGETS,package/audio/festival,speech-tools))
+$(eval $(call AUTOTARGETS,package/multimedia/festival,speech-tools))
 
diff --git a/package/audio/festival/voices/Config.in b/package/multimedia/festival/voices/Config.in
index b0a1cc0b1..b0a1cc0b1 100644
--- a/package/audio/festival/voices/Config.in
+++ b/package/multimedia/festival/voices/Config.in
diff --git a/package/audio/festival/voices/festvox.mk b/package/multimedia/festival/voices/festvox.mk
index 8456a4903..8456a4903 100644
--- a/package/audio/festival/voices/festvox.mk
+++ b/package/multimedia/festival/voices/festvox.mk
diff --git a/package/audio/libid3tag/Config.in b/package/multimedia/libid3tag/Config.in
index 869b9f7f6..869b9f7f6 100644
--- a/package/audio/libid3tag/Config.in
+++ b/package/multimedia/libid3tag/Config.in
diff --git a/package/audio/libid3tag/libid3tag.mk b/package/multimedia/libid3tag/libid3tag.mk
index 192cf11aa..3ba4e572c 100644
--- a/package/audio/libid3tag/libid3tag.mk
+++ b/package/multimedia/libid3tag/libid3tag.mk
@@ -17,7 +17,7 @@ $(DL_DIR)/$(LIBID3TAG_SOURCE):
 
 $(LIBID3TAG_DIR)/.unpacked: $(DL_DIR)/$(LIBID3TAG_SOURCE)
 	$(LIBID3TAG_CAT) $(DL_DIR)/$(LIBID3TAG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBID3TAG_DIR) package/audio/libid3tag/ libid3tag-$(LIBID3TAG_VERSION)\*.patch\*
+	toolchain/patch-kernel.sh $(LIBID3TAG_DIR) package/multimedia/libid3tag/ libid3tag-$(LIBID3TAG_VERSION)\*.patch\*
 	$(CONFIG_UPDATE) $(LIBID3TAG_DIR)
 	touch $@
 
diff --git a/package/audio/libmad/Config.in b/package/multimedia/libmad/Config.in
index 867a11a1e..867a11a1e 100644
--- a/package/audio/libmad/Config.in
+++ b/package/multimedia/libmad/Config.in
diff --git a/package/audio/libmad/libmad-0.15.1b-optimization.patch.avr32 b/package/multimedia/libmad/libmad-0.15.1b-optimization.patch.avr32
index b74eea322..b74eea322 100644
--- a/package/audio/libmad/libmad-0.15.1b-optimization.patch.avr32
+++ b/package/multimedia/libmad/libmad-0.15.1b-optimization.patch.avr32
diff --git a/package/audio/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk
index 1eb2cb013..c641f9fa7 100644
--- a/package/audio/libmad/libmad.mk
+++ b/package/multimedia/libmad/libmad.mk
@@ -16,8 +16,8 @@ $(DL_DIR)/$(LIBMAD_SOURCE):
 $(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE)
 	$(LIBMAD_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	$(CONFIG_UPDATE) $(LIBMAD_DIR)
-	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/audio/libmad/ libmad-$(LIBMAD_VERSION)\*.patch
-	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/audio/libmad/ libmad-$(LIBMAD_VERSION)\*.patch.$(ARCH)
+	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/multimedia/libmad/ libmad-$(LIBMAD_VERSION)\*.patch
+	toolchain/patch-kernel.sh $(LIBMAD_DIR) package/multimedia/libmad/ libmad-$(LIBMAD_VERSION)\*.patch.$(ARCH)
 	# Prevent automake from running.
 	(cd $(LIBMAD_DIR); touch -c config* aclocal.m4 Makefile*);
 	touch $@
diff --git a/package/audio/libogg/Config.in b/package/multimedia/libogg/Config.in
index bbaf08797..bbaf08797 100644
--- a/package/audio/libogg/Config.in
+++ b/package/multimedia/libogg/Config.in
diff --git a/package/audio/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk
index 12314ad4c..8ea08353b 100644
--- a/package/audio/libogg/libogg.mk
+++ b/package/multimedia/libogg/libogg.mk
@@ -12,4 +12,4 @@ LIBOGG_INSTALL_TARGET = YES
 
 LIBOGG_DEPENDENCIES = uclibc pkgconfig
 
-$(eval $(call AUTOTARGETS,package/audio,libogg))
+$(eval $(call AUTOTARGETS,package/multimedia,libogg))
diff --git a/package/audio/libsndfile/Config.in b/package/multimedia/libsndfile/Config.in
index ccc4dad6f..ccc4dad6f 100644
--- a/package/audio/libsndfile/Config.in
+++ b/package/multimedia/libsndfile/Config.in
diff --git a/package/audio/libsndfile/libsndfile-srconly.patch b/package/multimedia/libsndfile/libsndfile-srconly.patch
index 1796b80c0..1796b80c0 100644
--- a/package/audio/libsndfile/libsndfile-srconly.patch
+++ b/package/multimedia/libsndfile/libsndfile-srconly.patch
diff --git a/package/audio/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk
index d74493fde..637845228 100644
--- a/package/audio/libsndfile/libsndfile.mk
+++ b/package/multimedia/libsndfile/libsndfile.mk
@@ -15,7 +15,7 @@ $(DL_DIR)/$(LIBSNDFILE_SOURCE):
 
 $(LIBSNDFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(LIBSNDFILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBSNDFILE_DIR) package/audio/libsndfile/ \*.patch
+	toolchain/patch-kernel.sh $(LIBSNDFILE_DIR) package/multimedia/libsndfile/ \*.patch
 	$(CONFIG_UPDATE) $(LIBSNDFILE_DIR)
 	touch $@
 
diff --git a/package/audio/libvorbis/Config.in b/package/multimedia/libvorbis/Config.in
index 17fd4e845..17fd4e845 100644
--- a/package/audio/libvorbis/Config.in
+++ b/package/multimedia/libvorbis/Config.in
diff --git a/package/audio/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk
index a42ba3b45..a42ba3b45 100644
--- a/package/audio/libvorbis/libvorbis.mk
+++ b/package/multimedia/libvorbis/libvorbis.mk
diff --git a/package/audio/madplay/Config.in b/package/multimedia/madplay/Config.in
index a77cc367e..a77cc367e 100644
--- a/package/audio/madplay/Config.in
+++ b/package/multimedia/madplay/Config.in
diff --git a/package/audio/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk
index 94809942c..e81154541 100644
--- a/package/audio/madplay/madplay.mk
+++ b/package/multimedia/madplay/madplay.mk
@@ -23,7 +23,7 @@ $(DL_DIR)/$(MADPLAY_SOURCE):
 
 $(MADPLAY_DIR)/.unpacked: $(DL_DIR)/$(MADPLAY_SOURCE)
 	$(MADPLAY_CAT) $(DL_DIR)/$(MADPLAY_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MADPLAY_DIR) package/audio/madplay madplay\*.patch\*
+	toolchain/patch-kernel.sh $(MADPLAY_DIR) package/multimedia/madplay madplay\*.patch\*
 	$(CONFIG_UPDATE) $(MADPLAY_DIR)
 	touch $@
 
diff --git a/package/audio/mpg123/Config.in b/package/multimedia/mpg123/Config.in
index 69ae4c62a..69ae4c62a 100644
--- a/package/audio/mpg123/Config.in
+++ b/package/multimedia/mpg123/Config.in
diff --git a/package/audio/mpg123/mpg123-0.59r-cross.patch b/package/multimedia/mpg123/mpg123-0.59r-cross.patch
index c3fb5830c..c3fb5830c 100644
--- a/package/audio/mpg123/mpg123-0.59r-cross.patch
+++ b/package/multimedia/mpg123/mpg123-0.59r-cross.patch
diff --git a/package/audio/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk
index a56b69031..3fab25781 100644
--- a/package/audio/mpg123/mpg123.mk
+++ b/package/multimedia/mpg123/mpg123.mk
@@ -23,7 +23,7 @@ $(DL_DIR)/$(MPG123_SOURCE):
 
 $(MPG123_DIR)/.unpacked: $(DL_DIR)/$(MPG123_SOURCE)
 	$(MPG123_CAT) $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MPG123_DIR) package/audio/mpg123/ mpg123-$(MPG123_VERSION)\*.patch
+	toolchain/patch-kernel.sh $(MPG123_DIR) package/multimedia/mpg123/ mpg123-$(MPG123_VERSION)\*.patch
 	$(CONFIG_UPDATE) $(MPG123_DIR)/build
 	touch $@
 
diff --git a/package/multimedia/multimedia.mk b/package/multimedia/multimedia.mk
new file mode 100644
index 000000000..843f30e03
--- /dev/null
+++ b/package/multimedia/multimedia.mk
@@ -0,0 +1 @@
+include package/multimedia/*/*.mk
diff --git a/package/audio/speex/Config.in b/package/multimedia/speex/Config.in
index 424a83001..424a83001 100644
--- a/package/audio/speex/Config.in
+++ b/package/multimedia/speex/Config.in
diff --git a/package/audio/speex/speex.mk b/package/multimedia/speex/speex.mk
index 516781c11..7473557ae 100644
--- a/package/audio/speex/speex.mk
+++ b/package/multimedia/speex/speex.mk
@@ -22,7 +22,7 @@ ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y)
 	SPEEX_CONF_OPT += --enable-arm5e-asm
 endif
 
-$(eval $(call AUTOTARGETS,package/audio,speex))
+$(eval $(call AUTOTARGETS,package/multimedia,speex))
 
 $(SPEEX_TARGET_BUILD): $(SPEEX_TARGET_CONFIGURE)
 	$(call MESSAGE,"Building")