Merge svn changes up to r26979

Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c

1 files changed, 1 insertions, 0 deletions

diff --git a/options.h b/options.h
index 8b0950b489..a033f2ed9b 100644
--- a/options.h
+++ b/options.h
@@ -64,6 +64,7 @@ typedef struct MPOpts {
         unsigned int ar_delay;
         unsigned int ar_rate;
         char *js_dev;
+        char *ar_dev;
         char *in_file;
         int use_joystick;
         int use_lirc;