Merge svn changes up to r27374

Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c

1 files changed, 1 insertions, 1 deletions

diff --git a/gui/cfg.h b/gui/cfg.h
index c04d4614bf..8bd8fcc856 100644
--- a/gui/cfg.h
+++ b/gui/cfg.h
@@ -63,7 +63,7 @@ extern int    gui_main_pos_y;
 extern int    gui_sub_pos_x;
 extern int    gui_sub_pos_y;
 
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
 typedef struct {
     int enabled;
     int use_margins;