summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-04-21 05:27:45 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-04-21 05:27:45 +0000
commit045d3cc9b54510d89df91312d7a79ba7263052ae (patch)
tree213527beee1699f6f697e7841ae012e17b1a8b0f /apps
parent335de0b043cf2f9d624ee564ba63f0f9f2c5daeb (diff)
downloadrockbox-045d3cc9b54510d89df91312d7a79ba7263052ae.tar.gz
rockbox-045d3cc9b54510d89df91312d7a79ba7263052ae.zip
mpegplayer: Fix jumping past the frame waiting if Limit FPS is on but Skip Frames is not. Fixes FS#7055 though this was just a general mistake and not limited to the sim.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13227 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 6bd5abfa45..d4a5c06da6 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -1436,7 +1436,7 @@ static void video_thread(void)
1436 offset = eta_video; 1436 offset = eta_video;
1437 1437
1438 eta_video -= offset; 1438 eta_video -= offset;
1439 goto picture_draw; 1439 goto picture_wait;
1440 } 1440 }
1441 1441
1442 /** Possibly skip this frame **/ 1442 /** Possibly skip this frame **/
@@ -1538,6 +1538,7 @@ static void video_thread(void)
1538 skip_level = 1; /* Decoder skip: B */ 1538 skip_level = 1; /* Decoder skip: B */
1539 } 1539 }
1540 1540
1541 picture_wait:
1541 /* Wait until audio catches up */ 1542 /* Wait until audio catches up */
1542 while (eta_video > eta_audio) 1543 while (eta_video > eta_audio)
1543 { 1544 {