comparison mplayer.c @ 32770:5f64b983624a

FPS are in float in sh_video, not double. Original patch by rodries/wiimc.org. This is necessary for the next fix to come.
author cboesch
date Sat, 05 Feb 2011 19:05:02 +0000
parents 08deb5816d9c
children 87a44fc0f23d
comparison
equal deleted inserted replaced
32769:833b0eb23585 32770:5f64b983624a
3497 3497
3498 if(1 || mpctx->sh_video) { 3498 if(1 || mpctx->sh_video) {
3499 // after reading video params we should load subtitles because 3499 // after reading video params we should load subtitles because
3500 // we know fps so now we can adjust subtitle time to ~6 seconds AST 3500 // we know fps so now we can adjust subtitle time to ~6 seconds AST
3501 // check .sub 3501 // check .sub
3502 double fps = mpctx->sh_video ? mpctx->sh_video->fps : 25; 3502 float fps = mpctx->sh_video ? mpctx->sh_video->fps : 25;
3503 current_module="read_subtitles_file"; 3503 current_module="read_subtitles_file";
3504 load_subtitles(filename, fps, add_subtitles); 3504 load_subtitles(filename, fps, add_subtitles);
3505 if (mpctx->set_of_sub_size > 0) 3505 if (mpctx->set_of_sub_size > 0)
3506 mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size; 3506 mpctx->sub_counts[SUB_SOURCE_SUBS] = mpctx->set_of_sub_size;
3507 } 3507 }