Merge svn changes up to r26783

Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c

1 files changed, 1 insertions, 0 deletions

diff --git a/options.h b/options.h
index e03e719c8a..8b0950b489 100644
--- a/options.h
+++ b/options.h
@@ -57,6 +57,7 @@ typedef struct MPOpts {
         char *skip_frame_str;
         int threads;
         int bitexact;
+        char *avopt;
     } lavc_param;
     struct input_conf {
         char *config_file;