mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
1000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10719 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
8d79536625
commit
c81e374ce1
@ -285,7 +285,7 @@ int cfg_write( void )
|
||||
fprintf( f,"%s = \"%s\"\n",gui_opts[i].name, v);
|
||||
free(v);
|
||||
} else if((int)v == -1)
|
||||
mp_msg(MSGT_GPLAYER,MSGL_WARN,"Unable to save the %s option\n");
|
||||
mp_msg(MSGT_GPLAYER,MSGL_WARN,"Unable to save the '%s' option\n", gui_opts[i].name);
|
||||
}
|
||||
fclose( f );
|
||||
}
|
||||
|
@ -33,8 +33,6 @@
|
||||
#include "aspect.h"
|
||||
#include "mp_msg.h"
|
||||
|
||||
#include "../mplayer.h" /* exit_player() */
|
||||
|
||||
#ifdef HAVE_NEW_GUI
|
||||
#include "../Gui/interface.h"
|
||||
#endif
|
||||
@ -424,11 +422,11 @@ static uint32_t preinit(const char *arg)
|
||||
break;
|
||||
}
|
||||
if(!video_out_drivers[i]) {
|
||||
mp_msg(MSGT_VO, MSGL_ERR, "VO XOverlay: Subdriver %s not found\n");
|
||||
mp_msg(MSGT_VO, MSGL_ERR, "VO XOverlay: Subdriver %s not found\n", arg);
|
||||
return 1;
|
||||
}
|
||||
if(video_out_drivers[i]->control(VOCTRL_XOVERLAY_SUPPORT,NULL) != VO_TRUE) {
|
||||
mp_msg(MSGT_VO, MSGL_ERR, "VO XOverlay: %s doesn't support XOverlay\n");
|
||||
mp_msg(MSGT_VO, MSGL_ERR, "VO XOverlay: %s doesn't support XOverlay\n", arg);
|
||||
return 1;
|
||||
}
|
||||
// X11 init
|
||||
|
@ -175,7 +175,7 @@ int zoran_getcap(zr_info_t *zr) {
|
||||
}
|
||||
|
||||
if (ioctl(zr->vdes, VIDIOCGCAP, &zr->vc) < 0) {
|
||||
mp_msg(MSGT_VO, MSGL_ERR, "zr: error getting video capabilities from %s\n");
|
||||
mp_msg(MSGT_VO, MSGL_ERR, "zr: error getting video capabilities from %s\n", dev);
|
||||
return 1;
|
||||
}
|
||||
mp_msg(MSGT_VO, MSGL_V, "zr: MJPEG card reports maxwidth=%d, maxheight=%d\n", zr->vc.maxwidth, zr->vc.maxheight);
|
||||
|
@ -24,7 +24,7 @@ m_struct_alloc(m_struct_t* st) {
|
||||
void* r;
|
||||
|
||||
if(!st->defaults) {
|
||||
mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s need defaults\n");
|
||||
mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s needs defaults\n",st->name);
|
||||
return NULL;
|
||||
}
|
||||
// Check the struct fields
|
||||
|
@ -3572,7 +3572,7 @@ if(vo_config_count && vo_spudec) {
|
||||
len = vobsub_get_packet(vo_vobsub,sh_video->pts+sub_delay+next_frame_time,(void**)&packet,×tamp);
|
||||
if(len > 0) {
|
||||
timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000;
|
||||
mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0);
|
||||
mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0,timestamp);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user