Merge branch 'master' into osd_changes

Conflicts:
	Makefile
	command.c
	libvo/gl_common.c
	libvo/vo_corevideo.m
	libvo/vo_opengl.c
	libvo/vo_opengl_old.c
	libvo/vo_opengl_shaders.glsl
	sub/ass_mp.c
	sub/osd_libass.c
	sub/sd_ass.c

1 files changed, 8 insertions, 4 deletions

diff --git a/mplayer.h b/mplayer.h
index d1618bf929..1e99308656 100644
--- a/mplayer.h
+++ b/mplayer.h
@@ -31,15 +31,19 @@ extern float  audio_delay;
 
 extern double force_fps;
 
-extern int frame_dropping;
-
-extern int auto_quality;
-
 extern int vobsub_id;
 
 struct MPContext;
+struct MPOpts;
 struct subtitle;
 
 void set_osd_subtitle(struct MPContext *mpctx, struct subtitle *subs);
 
+struct mp_resolve_result {
+    char *url;
+    char *title;
+};
+
+struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts);
+
 #endif /* MPLAYER_MPLAYER_H */