avio: add a new flag for marking streams seekable by timestamp

Anton Khirnov committed 10 years ago

Commit 8ea35af1 parent 75c1db64 files · +13 −2Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavformat/avio.h +5 −0
libavformat/aviobuf.c +3 −0
libavformat/version.h +2 −2

doc/APIchanges+3−0

@@ -13,6 +13,9 @@ libavutil: 2015-08-28 · 12 unmodified lines
13	13
14	14	API changes, most recent first:
15	15
	16	+2016-xx-xx - xxxxxxx - lavf 57.08.0 - avio.h
	17	+ Add AVIO_SEEKABLE_TIME flag.
	18	+
16	19	2016-xx-xx - xxxxxxx - lavu 55.22.0 - pixfmt.h
17	20	Add AV_PIX_FMT_YUV(420,422,444)P12.
18	21

libavformat/avio.h+5−0

@@ -39,6 +39,11 @@ · 38 unmodified lines
39	39	*/
40	40	#define AVIO_SEEKABLE_NORMAL (1 << 0)
41	41
	42	+/**
	43	+ * Seeking by timestamp with avio_seek_time() is possible.
	44	+ */
	45	+#define AVIO_SEEKABLE_TIME (1 << 1)
	46	+
42	47	/**
43	48	* Callback for checking whether to abort blocking functions.
44	49	* AVERROR_EXIT is returned in this case by the interrupted

libavformat/aviobuf.c+3−0

@@ -846,6 +846,9 @@ int ffio_fdopen(AVIOContext *s, URLContext h) · 845 unmodified lines
846	846	if(h->prot) {
847	847	(*s)->read_pause = io_read_pause;
848	848	(*s)->read_seek = io_read_seek;
	849	+
	850	+ if (h->prot->url_read_seek)
	851	+ (*s)->seekable \|= AVIO_SEEKABLE_TIME;
849	852	}
850	853	(*s)->av_class = &ff_avio_class;
851	854	return 0;

libavformat/version.h+2−2

@@ -30,8 +30,8 @@ · 29 unmodified lines
30	30	#include "libavutil/version.h"
31	31
32	32	#define LIBAVFORMAT_VERSION_MAJOR 57
33		−#define LIBAVFORMAT_VERSION_MINOR 7
34		−#define LIBAVFORMAT_VERSION_MICRO 1
	33	+#define LIBAVFORMAT_VERSION_MINOR 8
	34	+#define LIBAVFORMAT_VERSION_MICRO 0
35	35
36	36	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
37	37	LIBAVFORMAT_VERSION_MINOR, \