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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9f7bc48d5e07f70800de164e05e8f8350fa2c7f6..e371d5d3d83ad7b84af86a5b7f7622f727e414e3 100644 (file)
--- 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
 }