diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 01:25:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 21:54:41 +0100 |
| commit | a8e748eee506f86b345323f532a87ab2050a00f2 (patch) | |
| tree | 04229fc51c55a1a490c6c2ab94a8ad526b6194d0 | |
| parent | 7c00d853a65884870e2a7a916197d87c125ed630 (diff) | |
| download | ffmpeg-a8e748eee506f86b345323f532a87ab2050a00f2.tar.gz | |
lavf: add seek2any to allow forcing seeking to non keyframes via AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avformat.h | 7 | ||||
| -rw-r--r-- | libavformat/options_table.h | 1 | ||||
| -rw-r--r-- | libavformat/utils.c | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8330c6b61b..03fca57051 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1203,6 +1203,13 @@ typedef struct AVFormatContext { */ unsigned int correct_ts_overflow; + /** + * Force seeking to any (also non key) frames. + * - encoding: unused + * - decoding: Set by user via AVOPtions (NO direct access) + */ + int seek2any; + /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavformat and can be changed and diff --git a/libavformat/options_table.h b/libavformat/options_table.h index e78e5981f2..6750050c1f 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -48,6 +48,7 @@ static const AVOption options[]={ {"keepside", "dont merge side data", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, {"latm", "enable RTP MP4A-LATM payload", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, +{"seek2any", "forces seeking to enable seek to any mode", OFFSET(seek2any), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, D}, {"analyzeduration", "specify how many microseconds are analyzed to probe the input", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT, {.i64 = 5*AV_TIME_BASE }, 0, INT_MAX, D}, {"cryptokey", "decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, {.dbl = 0}, 0, 0, D}, {"indexmem", "max memory used for timestamp index (per stream)", OFFSET(max_index_size), AV_OPT_TYPE_INT, {.i64 = 1<<20 }, 0, INT_MAX, D}, diff --git a/libavformat/utils.c b/libavformat/utils.c index 97d65583ee..10d2449d28 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2092,6 +2092,9 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int if(min_ts > ts || max_ts < ts) return -1; + if(s->seek2any>0) + flags |= AVSEEK_FLAG_ANY; + if (s->iformat->read_seek2) { int ret; ff_read_frame_flush(s); |