Mercurial > libavformat.hg

changeset 4709:2f7b32083fb0 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not lose user flags when passing calls from the new to the old seeking API.
author michael
date Sat, 14 Mar 2009 16:30:51 +0000
parents 87fbbc835a17
children 430cf07e7203
files utils.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/utils.c	Sat Mar 14 15:51:46 2009 +0000
+++ b/utils.c	Sat Mar 14 16:30:51 2009 +0000
@@ -1601,7 +1601,7 @@
     //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
 }