summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-02-25 03:18:11 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-02-25 03:18:11 +0000
commit1de2db8fab510b994f19be61882088410311d6de (patch)
tree8077f835294e22676d323409588f2b4a99b40f76 /libavformat
parent2b229186a27861c850370681438a8425b37a3710 (diff)
AVInputFormat.reed_seek2()
Originally committed as revision 17579 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index cf455da9e5..a61c8a0fa7 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -333,6 +333,8 @@ typedef struct AVInputFormat {
/** Close the stream. The AVFormatContext and AVStreams are not
freed by this function */
int (*read_close)(struct AVFormatContext *);
+
+#if LIBAVFORMAT_VERSION_MAJOR < 53
/**
* Seek to a given timestamp relative to the frames in
* stream component stream_index.
@@ -343,6 +345,7 @@ typedef struct AVInputFormat {
*/
int (*read_seek)(struct AVFormatContext *,
int stream_index, int64_t timestamp, int flags);
+#endif
/**
* Gets the next timestamp in stream[stream_index].time_base units.
* @return the timestamp or AV_NOPTS_VALUE if an error occurred
@@ -368,6 +371,14 @@ typedef struct AVInputFormat {
const struct AVCodecTag * const *codec_tag;
+ /**
+ * Seek to timestamp ts.
+ * Seeking will be done so that the point from which all active streams
+ * can be presented successfully will be closest to ts and within min/max_ts.
+ * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL.
+ */
+ int (*reed_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
+
/* private fields */
struct AVInputFormat *next;
} AVInputFormat;