[FFmpeg-cvslog] r17959 - trunk/libavformat/utils.c

michael subversion
Sat Mar 14 17:30:51 CET 2009


Author: michael
Date: Sat Mar 14 17:30:51 2009
New Revision: 17959

Log:
Dont loose user flags when passing calls from the new to the old seeking API.

Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Sat Mar 14 17:24:30 2009	(r17958)
+++ trunk/libavformat/utils.c	Sat Mar 14 17:30:51 2009	(r17959)
@@ -1601,7 +1601,7 @@ int avformat_seek_file(AVFormatContext *
     //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
 }




More information about the ffmpeg-cvslog mailing list