[SCM] libav/experimental: Do not lose user flags when passing calls from the new to the old seeking API.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 85b4230f6848f4af1c76dc0bfae5c3468437d158
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Mar 14 16:30:51 2009 +0000

    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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9f7bc48..e371d5d 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
 }

-- 
Libav/FFmpeg packaging