diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-21 17:07:44 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 17:07:44 -0300 |
| commit | fc9f14c7de5bff05bab6f7b258ca70b777ce04ed (patch) | |
| tree | ba41f1c576849fd54e61ea064d886a134a5914cf /libavformat | |
| parent | de36e98a16f495d051e301653115ebf99a7d7929 (diff) | |
| parent | 8ea35af7620e4f73f9e8c072e1c0fac9a04ec161 (diff) | |
| download | ffmpeg-fc9f14c7de5bff05bab6f7b258ca70b777ce04ed.tar.gz | |
Merge commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161'
* commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161':
avio: add a new flag for marking streams seekable by timestamp
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio.h | 5 | ||||
| -rw-r--r-- | libavformat/aviobuf.c | 3 | ||||
| -rw-r--r-- | libavformat/version.h | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index cec7fd74d9..6f4ed8440d 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -40,6 +40,11 @@ #define AVIO_SEEKABLE_NORMAL (1 << 0) /** + * Seeking by timestamp with avio_seek_time() is possible. + */ +#define AVIO_SEEKABLE_TIME (1 << 1) + +/** * Callback for checking whether to abort blocking functions. * AVERROR_EXIT is returned in this case by the interrupted * function. During blocking operations, callback is called with diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 5f58ab064b..ef6a0d4e9b 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -934,6 +934,9 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) if(h->prot) { (*s)->read_pause = io_read_pause; (*s)->read_seek = io_read_seek; + + if (h->prot->url_read_seek) + (*s)->seekable |= AVIO_SEEKABLE_TIME; } (*s)->short_seek_get = io_short_seek; (*s)->av_class = &ff_avio_class; diff --git a/libavformat/version.h b/libavformat/version.h index bfc42e3f15..dd4c680803 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 66 -#define LIBAVFORMAT_VERSION_MICRO 105 +#define LIBAVFORMAT_VERSION_MINOR 67 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |