aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPanagiotis H.M. Issaris <takis.issaris@uhasselt.be>2011-11-28 13:48:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-16 15:21:19 +0100
commit2a66a653413b36e8171aa4db758f7c51e1304f4d (patch)
treead75baef5788e34d403354f53e107022dd277890
parent964d75735f6a4412437b3fc0ea9a0c5bb586811b (diff)
downloadffmpeg-2a66a653413b36e8171aa4db758f7c51e1304f4d.tar.gz
ffplay: add 10 minute seek support to ffplay
Signed-off-by: Marton Balint <cus@passwd.hu> (cherry picked from commit 91a3ea671adda0039c6c221f158a88391416b574) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/ffplay.texi3
-rw-r--r--ffplay.c7
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index b4d6dbcdcb..06666f6e59 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -168,6 +168,9 @@ Seek backward/forward 10 seconds.
@item down/up
Seek backward/forward 1 minute.
+@item page down/page up
+Seek backward/forward 10 minutes.
+
@item mouse click
Seek to percentage in file corresponding to fraction of width.
diff --git a/ffplay.c b/ffplay.c
index 04289dfeeb..9f3be0ced0 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2853,6 +2853,12 @@ static void event_loop(VideoState *cur_stream)
case SDLK_w:
toggle_audio_display(cur_stream);
break;
+ case SDLK_PAGEUP:
+ incr = 600.0;
+ goto do_seek;
+ case SDLK_PAGEDOWN:
+ incr = -600.0;
+ goto do_seek;
case SDLK_LEFT:
incr = -10.0;
goto do_seek;
@@ -3122,6 +3128,7 @@ static int opt_help(const char *opt, const char *arg)
"s activate frame-step mode\n"
"left/right seek backward/forward 10 seconds\n"
"down/up seek backward/forward 1 minute\n"
+ "page down/page up seek backward/forward 10 minutes\n"
"mouse click seek to percentage in file corresponding to fraction of width\n"
);
return 0;