[FFmpeg-cvslog] lavf: Reimplement new seek API emulation

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 18 00:16:58 2012 +0100| [92b5f71a7d30974250918b12e93c974b9b555d11] | committer: Michael Niedermayer

lavf: Reimplement new seek API emulation

This fixes seeking to before and after files with ffplay.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/utils.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 155ba67..16a74f2 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1819,8 +1819,16 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
     //Fallback to old API if new is not implemented but old is
     //Note the old has somewat different sematics
     AV_NOWARN_DEPRECATED(
-    if(s->iformat->read_seek || 1)
-        return av_seek_frame(s, stream_index, ts, flags | (ts - min_ts > (uint64_t)(max_ts - ts) ? AVSEEK_FLAG_BACKWARD : 0));
+    if (s->iformat->read_seek || 1) {
+        int dir = (ts - min_ts > (uint64_t)(max_ts - ts) ? AVSEEK_FLAG_BACKWARD : 0);
+        int ret = av_seek_frame(s, stream_index, ts, flags | dir);
+        if (ret<0 && ts != min_ts && max_ts != ts) {
+            ret = av_seek_frame(s, stream_index, dir ? max_ts : min_ts, flags | dir);
+            if (ret >= 0)
+                ret = av_seek_frame(s, stream_index, ts, flags | (dir^AVSEEK_FLAG_BACKWARD));
+        }
+        return ret;
+    }
     )
 
     // try some generic seek like seek_frame_generic() but with new ts semantics