From 1da7b3334451fc6dbb118a49e012442beff4e050 Mon Sep 17 00:00:00 2001 From: michael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> Date: Sat, 14 Mar 2009 16:30:51 +0000 Subject: [PATCH] Dont loose user flags when passing calls from the new to the old seeking API. git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17959 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 9f7bc48d5..e371d5d3d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1601,7 +1601,7 @@ 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 if(s->iformat->read_seek || 1) - return av_seek_frame(s, stream_index, ts, ts - min_ts > (uint64_t)(max_ts - ts) ? AVSEEK_FLAG_BACKWARD : 0); + return av_seek_frame(s, stream_index, ts, flags | (ts - min_ts > (uint64_t)(max_ts - ts) ? AVSEEK_FLAG_BACKWARD : 0)); // try some generic seek like av_seek_frame_generic() but with new ts semantics } -- 2.25.4