diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-03-14 16:30:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-03-14 16:30:51 +0000 |
| commit | 85b4230f6848f4af1c76dc0bfae5c3468437d158 (patch) | |
| tree | 0c94e1c04db192c9ff0aed04040293f27e7ab643 /libavformat | |
| parent | 4ed29207c2d2a72a6943d85cf58b5fc50cc2adec (diff) | |
| download | ffmpeg-85b4230f6848f4af1c76dc0bfae5c3468437d158.tar.gz | |
Do not lose user flags when passing calls from the new to the old seeking API.
Originally committed as revision 17959 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9f7bc48d5e..e371d5d3d8 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 } |