summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-28 02:16:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-03-28 02:16:56 +0200
commite206b51fd377425ec4c4a37160b9753e49809416 (patch)
tree037945139fd4d08ae4b68a0c504ec677ac2886e8
parenta0340dfbd78df7639715056937011d2d414aaeed (diff)
parente6093e3640ab9303523dcd79394cce0e0702238c (diff)
Merge remote-tracking branch 'cus/stable'
* cus/stable: ffplay: pause rdft column when ffplay is paused Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffplay.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffplay.c b/ffplay.c
index 00be13de43..3d61a2292b 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -867,7 +867,8 @@ static void video_audio_display(VideoState *s)
}
}
SDL_UpdateRect(screen, s->xpos, s->ytop, 1, s->height);
- s->xpos++;
+ if (!s->paused)
+ s->xpos++;
if (s->xpos >= s->width)
s->xpos= s->xleft;
}