Index: DOCS/man/en/mplayer.1
===================================================================
--- DOCS/man/en/mplayer.1	(revision 22908)
+++ DOCS/man/en/mplayer.1	(working copy)
@@ -1673,8 +1673,9 @@
 The default is fast resampling that may cause distortion.
 .
 .TP
-.B \-ss <time> (also see \-sb)
-Seek to given time position.
+.B \-ss <time> (also see \-sb, \-hr-edl-seek)
+Seek to given time position. For most video format, it will only seek to the
+next nearest keyframe by default.
 .sp 1
 .I EXAMPLE:
 .PD 0
@@ -6757,7 +6758,8 @@
 Use a more precise, but much slower method for skipping areas.
 Areas marked for skipping are not seeked over, instead all
 frames are decoded, but only the necessary frames are encoded.
-This allows starting at non-keyframe boundaries.
+This allows starting at non-keyframe boundaries. This also applies
+to the -ss switch.
 .br
 .I NOTE:
 Not guaranteed to work right with '\-ovc copy'.
Index: mencoder.c
===================================================================
--- mencoder.c	(revision 22908)
+++ mencoder.c	(working copy)
@@ -288,7 +288,7 @@
 /** \brief Seeks for EDL
     \return 1 for success, 0 for failure, 2 for EOF.
 */
-static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy);
+static int seek_wrapper(float seek_to, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy);
 
 #include "cfg-mencoder.h"
 
@@ -1035,7 +1035,8 @@
 }
 
 if (seek_to_sec) {
-    demux_seek(demuxer, seek_to_sec, audio_delay, 1);
+    seek_wrapper(seek_to_sec, demuxer, d_audio, mux_a, &frame_data, mux_v->codec==VCODEC_COPY);
+    // demux_seek(demuxer, seek_to_sec, audio_delay, 1);
 //  there is 2 way to handle the -ss option in 3-pass mode:
 // > 1. do the first pass for the whole file, and use -ss for 2nd/3rd pases only
 // > 2. do all the 3 passes with the same -ss value
@@ -1099,7 +1100,7 @@
             mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: start [%f], stop [%f], length [%f]\n",
                    next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec);
 
-            result = edl_seek(next_edl_record, demuxer, d_audio, mux_a, &frame_data, mux_v->codec==VCODEC_COPY);
+            result = seek_wrapper(next_edl_record->stop_sec, demuxer, d_audio, mux_a, &frame_data, mux_v->codec==VCODEC_COPY);
 
             if (result == 2) { at_eof=1; break; } // EOF
             else if (result == 0) edl_seeking = 0; // no seeking
@@ -1678,7 +1679,7 @@
 
         if (print_info) mp_msg(MSGT_MENCODER, MSGL_STATUS,
                MSGTR_EdlSkipStartEndCurrent,
-               next_edl_record->start_sec, next_edl_record->stop_sec,
+               0.0, end_pts,
                sh_video->pts, a_pts);
     }
     if (interrupted) return 2;
@@ -1706,26 +1707,66 @@
     slowseek(a_pts - audio_delay, d_video, d_audio, mux_a, frame_data, framecopy, 0);
 }
 
-static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy) {
+/**
+ * Seek using different methodology depends on user option
+ * @param seek_to relative time for seeking in second
+ * @return 0 for non-seekable stream. 1 if sucessfully seeked. 2 if EOF is reached.
+ */
+static int seek_wrapper(float seek_to, demuxer_t* demuxer, demux_stream_t *d_audio, muxer_stream_t* mux_a, s_frame_data * frame_data, int framecopy) {
     sh_video_t * sh_video = demuxer->video ? demuxer->video->sh : NULL;
+    float target = seek_to - 30;
+    float up_b  = seek_to;
+    float low_b = 0;
+    if (target < 0) target = up_b;
 
-    if (!sh_video) return 0;
-    if (sh_video->pts >= next_edl_record->stop_sec) return 1; // nothing to do...
+    /* For audio only, demux_seek is sufficient */
+    if (!sh_video) {
+        return demux_seek(demuxer, seek_to, audio_delay, 1) ? 1 : 0;
+    }
 
+    /* For video with or without audio */
     if (!edl_seek_type) {
-        if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, audio_delay, 0)){
+        if(demux_seek(demuxer, seek_to - sh_video->pts, audio_delay, 0)){
             sh_video->pts = demuxer->video->pts;
             //if (vo_vobsub) vobsub_seek(vo_vobsub,sh_video->pts);
             resync_video_stream(sh_video);
             //if(vo_spudec) spudec_reset(vo_spudec);
-            if (audio_delay != 0.0) fixdelay(demuxer->video, d_audio, mux_a, frame_data, framecopy);
+            if (d_audio && audio_delay != 0.0) fixdelay(demuxer->video, d_audio, mux_a, frame_data, framecopy);
             return 1;
         }
         // non-seekable stream.
         return 0;
     }
 
+    // high resolution seek
+    while (up_b - low_b > 2.5) { // Small enough range to do slowseek
+        // non-seekable stream.
+        if (demux_seek(demuxer, target - sh_video->pts, audio_delay, 0) == 0)
+            return 0;
+
+        // Read one frame to get the sh_video->pts
+        frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps);
+        if (frame_data->in_size < 0) return 2; // EOF reached
+
+        // Do bisection
+       mp_msg(MSGT_MENCODER, MSGL_DBG2, "hr-edl: bisection seeking: %f > _%f_ < %f, got %f\n",
+                low_b, target, up_b, sh_video->pts);
+        if (sh_video->pts > seek_to) { up_b = target; }
+        else if (sh_video->pts < seek_to) { low_b = target; }
+
+        target = (up_b + low_b) / 2;
+    }
+    // re-seek to a point so we could start slowseek
+    mp_msg(MSGT_MENCODER, MSGL_V,
+            "hr-edl: seeking to the previous seekable point at %f, now slowseek to %f\n",
+            low_b, seek_to);
+    frame_data->already_read = 0;
+    if (demux_seek(demuxer, low_b - sh_video->pts, audio_delay, 0) == 0)
+        return 0;
+    sh_video->pts = demuxer->video->pts;
+    resync_video_stream(sh_video);
+    if (d_audio && audio_delay != 0.0) fixdelay(demuxer->video, d_audio, mux_a, frame_data, framecopy);
+
     // slow seek, read every frame.
-
-    return slowseek(next_edl_record->stop_sec, demuxer->video, d_audio, mux_a, frame_data, framecopy, 1);
+    return slowseek(seek_to, demuxer->video, d_audio, mux_a, frame_data, framecopy, 1);
 }