diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2018-09-03 11:10:35 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2018-09-05 14:08:18 +0800 |
| commit | fbd8746efabe441469eb410d2ffa6af64987ca80 (patch) | |
| tree | fd9a55da6b988bcf82f86d2703160fe98336c018 /libavformat/version.h | |
| parent | 17c635e605af5a708ce6e29f18946f4089e66c6f (diff) | |
| download | ffmpeg-fbd8746efabe441469eb410d2ffa6af64987ca80.tar.gz | |
avformat/hlsenc: rename option from use_localtime to strftime
fix ticket: 7393
indent option name to segment
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 9496b72200..4d21583426 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 58 -#define LIBAVFORMAT_VERSION_MINOR 17 -#define LIBAVFORMAT_VERSION_MICRO 106 +#define LIBAVFORMAT_VERSION_MINOR 18 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ @@ -70,6 +70,9 @@ #ifndef FF_API_HLS_WRAP #define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59) #endif +#ifndef FF_API_HLS_USE_LOCALTIME +#define FF_API_HLS_USE_LOCALTIME (LIBAVFORMAT_VERSION_MAJOR < 59) +#endif #ifndef FF_API_LAVF_KEEPSIDE_FLAG #define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59) #endif |