Commit 9d112433 authored by Simon Morlat's avatar Simon Morlat
Browse files

Merge branch 'master' of git.linphone.org:mediastreamer2

parents 9ab39114 8e59b26b
......@@ -777,8 +777,6 @@ void ms_display_destroy(MSDisplay *obj){
static MSDisplayDesc *default_display_desc=&ms_xv_display_desc;
#elif HAVE_SDL
static MSDisplayDesc *default_display_desc=&ms_sdl_display_desc;
#elif defined(WIN32)
static MSDisplayDesc *default_display_desc=&ms_win_display_desc;
#else
static MSDisplayDesc *default_display_desc=NULL;
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment