summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-05-03 10:31:33 +0200
committerNicolas George <nicolas.george@normalesup.org>2013-05-04 14:11:53 +0200
commit3fc66dfef22c044d1bbe36d0739441205bd99923 (patch)
tree9ef97ce4b3acc108bc68b757b7bef4f219405ff6 /libavformat
parentcc24afb45cfda95eda91ae8dbdfaa26aa35acc36 (diff)
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
Also document that it has no effect.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h1
-rw-r--r--libavformat/utils.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index f21dd90305..a9ea1d8e1f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1687,6 +1687,7 @@ int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp,
* or if stream_index is -1, in AV_TIME_BASE units.
* If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
* keyframes (this may not be supported by all demuxers).
+ * If flags contain AVSEEK_FLAG_BACKWARD, it is ignored.
*
* @param stream_index index of the stream which is used as time base reference
* @param min_ts smallest acceptable timestamp
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 29f4c1de62..33b3e75a97 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2164,6 +2164,7 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
if(s->seek2any>0)
flags |= AVSEEK_FLAG_ANY;
+ flags &= ~AVSEEK_FLAG_BACKWARD;
if (s->iformat->read_seek2) {
int ret;