[FFmpeg-cvslog] ffplay: seek only when pressing the right mouse button on the video window

Vittorio Gambaletta VittGam git at videolan.org
Tue Jan 19 23:29:53 CET 2016


ffmpeg | branch: master | Vittorio Gambaletta (VittGam) <ffmpeg-dev at vittgam.net> | Tue Jan 19 00:57:38 2016 +0100| [cde4b99f476875f53aa1596e937691de952ab457] | committer: Marton Balint

ffplay: seek only when pressing the right mouse button on the video window

Seeking by clicking on the video window can be annoying, because
the user might click on it accidentally while eg. trying to get
focus on it, and ffplay seeks instead.

This commit changes that behaviour to seek only when the right
mouse button is used to click and drag on the window.

Signed-off-by: Vittorio Gambaletta <ffmpeg-dev at vittgam.net>
Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cde4b99f476875f53aa1596e937691de952ab457
---

 Changelog |    1 +
 ffplay.c  |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index ed18cf1..d458991 100644
--- a/Changelog
+++ b/Changelog
@@ -54,6 +54,7 @@ version <next>:
 - libstagefright support removed
 - spectrumsynth filter
 - ahistogram filter
+- only seek with the right mouse button in ffplay
 
 
 version 2.8:
diff --git a/ffplay.c b/ffplay.c
index d2e3dc6..2fa7165 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -3480,9 +3480,11 @@ static void event_loop(VideoState *cur_stream)
             }
             cursor_last_shown = av_gettime_relative();
             if (event.type == SDL_MOUSEBUTTONDOWN) {
+                if (event.button.button != SDL_BUTTON_RIGHT)
+                    break;
                 x = event.button.x;
             } else {
-                if (event.motion.state != SDL_PRESSED)
+                if (!(event.motion.state & SDL_BUTTON_RMASK))
                     break;
                 x = event.motion.x;
             }



More information about the ffmpeg-cvslog mailing list