diff options
| author | Mariusz Szczepańczyk <mszczepanczyk@gmail.com> | 2015-04-03 03:54:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 04:09:34 +0200 |
| commit | 26e0e393d0cae316042639bb7e910b2a5796dae2 (patch) | |
| tree | d26d4b968f601fe2d927fbddc9c6a427b849060e /libavformat | |
| parent | b2c05867f50d7b4193f505e8cd5af0d8b02461c5 (diff) | |
| download | ffmpeg-26e0e393d0cae316042639bb7e910b2a5796dae2.tar.gz | |
lavf/avio: Add new types to AVIODirEntryType, bump minor version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio.h | 5 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index f61a8f8763..51913e39fc 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -63,7 +63,10 @@ enum AVIODirEntryType { AVIO_ENTRY_NAMED_PIPE, AVIO_ENTRY_SYMBOLIC_LINK, AVIO_ENTRY_SOCKET, - AVIO_ENTRY_FILE + AVIO_ENTRY_FILE, + AVIO_ENTRY_SERVER, + AVIO_ENTRY_SHARE, + AVIO_ENTRY_WORKGROUP, }; /** diff --git a/libavformat/version.h b/libavformat/version.h index 2c7c621254..1c78df2fb8 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 -#define LIBAVFORMAT_VERSION_MINOR 28 +#define LIBAVFORMAT_VERSION_MINOR 29 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |