Commit fc9f14c7 authored by James Almer's avatar James Almer

Merge commit '8ea35af7'

* commit '8ea35af7':
  avio: add a new flag for marking streams seekable by timestamp
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents de36e98a 8ea35af7
...@@ -15,6 +15,9 @@ libavutil: 2015-08-28 ...@@ -15,6 +15,9 @@ libavutil: 2015-08-28
API changes, most recent first: API changes, most recent first:
2017-03-21 - xxxxxxx - lavf 57.67.100 / 57.08.0 - avio.h
Add AVIO_SEEKABLE_TIME flag.
2017-03-21 - xxxxxxx - lavf 57.66.105, lavc 57.83.101 - avformat.h, avcodec.h 2017-03-21 - xxxxxxx - lavf 57.66.105, lavc 57.83.101 - avformat.h, avcodec.h
Deprecate AVFMT_FLAG_KEEP_SIDE_DATA. It will be ignored after the next major Deprecate AVFMT_FLAG_KEEP_SIDE_DATA. It will be ignored after the next major
bump, and libavformat will behave as if it were always set. bump, and libavformat will behave as if it were always set.
......
...@@ -39,6 +39,11 @@ ...@@ -39,6 +39,11 @@
*/ */
#define AVIO_SEEKABLE_NORMAL (1 << 0) #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. * Callback for checking whether to abort blocking functions.
* AVERROR_EXIT is returned in this case by the interrupted * AVERROR_EXIT is returned in this case by the interrupted
......
...@@ -934,6 +934,9 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) ...@@ -934,6 +934,9 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
if(h->prot) { if(h->prot) {
(*s)->read_pause = io_read_pause; (*s)->read_pause = io_read_pause;
(*s)->read_seek = io_read_seek; (*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)->short_seek_get = io_short_seek;
(*s)->av_class = &ff_avio_class; (*s)->av_class = &ff_avio_class;
......
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here // Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 66 #define LIBAVFORMAT_VERSION_MINOR 67
#define LIBAVFORMAT_VERSION_MICRO 105 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment