* changed some strings as suggested by E-bola

[vlc] / defconfig

diff --git a/defconfig b/defconfig
index ca2aecef00177de14aeee0bf1eff5ab3962c68ec..10026734d681a98afa975dd29f73fed97066c766 100644 (file)
--- a/defconfig
+++ b/defconfig
@@ -2,13 +2,25 @@
 # Automatically generated by make menuconfig: don't edit
 #
 CONFIG_LINUX=y
+# CONFIG_MAC is not set
 # CONFIG_WIN32 is not set
 
 #
 # Graphical User Interfaces
 #
+CONFIG_GTK=y
 CONFIG_GNOME=y
-# CONFIG_GTK is not set
+# CONFIG_GTK2 is not set
+# CONFIG_GNOME2 is not set
+CONFIG_SKINS=y
+# CONFIG_FAMILIAR is not set
+# CONFIG_WXWINDOWS is not set
+# CONFIG_QT is not set
+# CONFIG_KDE is not set
+# CONFIG_OPIE is not set
+# CONFIG_QNX is not set
+# CONFIG_NCURSES is not set
+# CONFIG_XOSD is not set
 
 #
 # Inputs
@@ -17,6 +29,7 @@ CONFIG_DVD=y
 CONFIG_DVDOLD=y
 # CONFIG_DVDREAD is not set
 # CONFIG_DVDPLAY is not set
+CONFIG_DVBPSI=y
 # CONFIG_VCD is not set
 # CONFIG_V4L is not set
 # CONFIG_SAT is not set
@@ -24,21 +37,55 @@ CONFIG_DVDOLD=y
 #
 # Video outputs
 #
-CONFIG_X11=y
+# CONFIG_X11 is not set
 CONFIG_XVIDEO=y
 # CONFIG_FB is not set
 # CONFIG_SDL is not set
+# CONFIG_FREETYPE is not set
+# CONFIG_QTE is not set
+# CONFIG_MGA is not set
+# CONFIG_SVGALIB is not set
+# CONFIG_GGI is not set
+# CONFIG_GLIDE is not set
+# CONFIG_AA is not set
 
 #
 # Audio outputs
 #
 CONFIG_OSS=y
 CONFIG_ESD=y
+# CONFIG_ARTS is not set
+# CONFIG_ALSA is not set
 
 #
 # Codecs
 #
+CONFIG_OGG=y
 CONFIG_A52=y
 CONFIG_MAD=y
 CONFIG_FFMPEG=y
 CONFIG_FFMPEG_TREE="/home/cyril/ffmpeg"
+# CONFIG_FAAD is not set
+# CONFIG_XVID is not set
+# CONFIG_DV is not set
+# CONFIG_FLAC is not set
+CONFIG_LIBMPEG2=y
+CONFIG_VORBIS=y
+# CONFIG_TREMOR is not set
+# CONFIG_TARKIN is not set
+# CONFIG_THEORA is not set
+
+#
+# Streaming
+#
+CONFIG_SOUT=y
+
+#
+# Miscellaneous options
+#
+CONFIG_SLP=y
+
+#
+# Compilation options
+#
+# CONFIG_DEBUG is not set