diff options
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -104,7 +104,6 @@ #include "input/input.h" -const int under_mencoder = 0; int slave_mode=0; int enable_mouse_movements=0; float start_volume = -1; @@ -3418,7 +3417,7 @@ static void run_playloop(struct MPContext *mpctx) aq_sleep_time += mpctx->time_frame; // flag 256 means: libvo driver does its timing (dvb card) if (mpctx->time_frame > 0.001 - && !(mpctx->sh_video->output_flags&256)) + && !(mpctx->sh_video->output_flags & VFCAP_TIMER)) mpctx->time_frame = timing_sleep(mpctx, mpctx->time_frame); mpctx->time_frame += mpctx->video_out->flip_queue_offset; @@ -4408,7 +4407,7 @@ if(stream_dump_type==5){ len=stream_read(mpctx->stream,buf,4096); if(len>0) { if(fwrite(buf,len,1,f) != 1) { - mp_tmsg(MSGT_MENCODER,MSGL_FATAL,"%s: Error writing file.\n",opts->stream_dump_name); + mp_tmsg(MSGT_GLOBAL,MSGL_FATAL,"%s: Error writing file.\n",opts->stream_dump_name); exit_player(mpctx, EXIT_ERROR); } } @@ -4421,7 +4420,7 @@ if(stream_dump_type==5){ } } if(fclose(f)) { - mp_tmsg(MSGT_MENCODER,MSGL_FATAL,"%s: Error writing file.\n",opts->stream_dump_name); + mp_tmsg(MSGT_GLOBAL,MSGL_FATAL,"%s: Error writing file.\n",opts->stream_dump_name); exit_player(mpctx, EXIT_ERROR); } mp_tmsg(MSGT_CPLAYER,MSGL_INFO,"Core dumped ;)\n"); @@ -4729,7 +4728,7 @@ if(!reinit_video_chain(mpctx)) { } } - if(mpctx->sh_video->output_flags & 0x08 && vo_spudec) + if(mpctx->sh_video->output_flags & VFCAP_SPU && vo_spudec) spudec_set_hw_spu(vo_spudec,mpctx->video_out); #ifdef CONFIG_FREETYPE |