[FFmpeg-cvslog] Merge commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Mar 21 17:07:44 2017 -0300| [fc9f14c7de5bff05bab6f7b258ca70b777ce04ed] | committer: James Almer

Merge commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161'

* commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161':
  avio: add a new flag for marking streams seekable by timestamp

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc9f14c7de5bff05bab6f7b258ca70b777ce04ed
---

 doc/APIchanges        | 3 +++
 libavformat/avio.h    | 5 +++++
 libavformat/aviobuf.c | 3 +++
 libavformat/version.h | 4 ++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index aadf164..eccfb70 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2015-08-28
 
 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
   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.
diff --git a/libavformat/avio.h b/libavformat/avio.h
index cec7fd7..6f4ed84 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 5f58ab0..ef6a0d4 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 bfc42e3..dd4c680 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, \


======================================================================

diff --cc doc/APIchanges
index aadf164,6fd3959..eccfb70
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,12 -13,16 +15,15 @@@ libavutil:     2015-08-2
  
  API changes, most recent first:
  
 -2016-xx-xx - xxxxxxx - lavf 57.08.0 - avio.h
++2017-03-21 - xxxxxxx - lavf 57.67.100 / 57.08.0 - avio.h
+   Add AVIO_SEEKABLE_TIME flag.
+ 
 -2016-xx-xx - xxxxxxx - lavu 55.22.0 - pixfmt.h
 -  Add AV_PIX_FMT_YUV(420,422,444)P12.
 +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
 +  bump, and libavformat will behave as if it were always set.
 +  Deprecate av_packet_merge_side_data() and av_packet_split_side_data().
  
 -2016-xx-xx - xxxxxxx - lavc 57.27.0 - avcodec.h
 -  Add FF_PROFILE_HEVC_REXT, the extended pixel format profile for HEVC.
 -
 -2016-08-24 - xxxxxxx - lavu 55.21.0 - imgutils.h
 +2016-03-20 - xxxxxxx - lavu 55.50.100 / 55.21.0 - imgutils.h
    Add av_image_copy_uc_from(), a version of av_image_copy() for copying
    from GPU mapped memory.
  
diff --cc libavformat/aviobuf.c
index 5f58ab0,5cb733d..ef6a0d4
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@@ -934,8 -846,10 +934,11 @@@ int ffio_fdopen(AVIOContext **s, URLCon
      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;
      return 0;
  fail:
diff --cc libavformat/version.h
index bfc42e3,a6643a9..dd4c680
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@@ -29,11 -29,9 +29,11 @@@
  
  #include "libavutil/version.h"
  
 -#define LIBAVFORMAT_VERSION_MAJOR 57
 -#define LIBAVFORMAT_VERSION_MINOR  8
 -#define LIBAVFORMAT_VERSION_MICRO  0
 +// 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, \