RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7924 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pl 2002-10-26 00:28:48 +00:00
parent 51e17bcc22
commit 85e58efc7c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mplayer.c
View File

@ -1367,7 +1367,7 @@ if (!sh_video && !sh_audio)
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 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
}
#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 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
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;