# HG changeset patch # User pl # Date 1035592128 0 # Node ID bad21f499a9eefa005ec3b202f96858e8eafc868 # Parent 9ec1e707f736bd619f58e3536a5fb9f8aa2ce9e6 avoids segfaults w.r.t to mp3 files handling: hunk1 => mplayer -fps 42 foobar.mp3 (yeah it's a bit dumb but... ;) hunk2 => mplayer *.mp3 + next file + volume increase hunk3 => preventive bugfix diff -r 9ec1e707f736 -r bad21f499a9e mplayer.c --- a/mplayer.c Fri Oct 25 23:58:33 2002 +0000 +++ b/mplayer.c Sat Oct 26 00:28:48 2002 +0000 @@ -1367,7 +1367,7 @@ goto goto_next_file; if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! -if(force_fps){ +if(force_fps && sh_video){ vo_fps = sh_video->fps=force_fps; sh_video->frametime=1.0f/sh_video->fps; mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime); @@ -1970,7 +1970,7 @@ } #ifdef USE_OSD - if(osd_level){ + if(osd_level && sh_video){ osd_visible=sh_video->fps; // 1 sec vo_osd_progbar_type=OSD_VOLUME; vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0; @@ -2212,7 +2212,7 @@ vo_panscan = res > 1 ? 1 : res < 0 ? 0 : res; video_out->control( VOCTRL_SET_PANSCAN,NULL ); #ifdef USE_OSD - if(osd_level){ + if(osd_level && sh_video){ osd_visible=sh_video->fps; // 1 sec vo_osd_progbar_type=OSD_PANSCAN; vo_osd_progbar_value=vo_panscan*256;