Unified · Split
| @@ -15,6 +15,10 @@ libavutil: 2017-10-21 · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | API changes, most recent first: |
| 17 | 17 | |
| 18 | +2018-01-xx - xxxxxxx - lavf 58.4.100 - avformat.h | |
| 19 | + Deprecate AVStream.recommended_encoder_configuration. It was useful only for | |
| 20 | + FFserver, which has been removed. | |
| 21 | + | |
| 18 | 22 | 2018-01-xx - xxxxxxx - lavfi 7.11.101 - avfilter.h |
| 19 | 23 | Deprecate avfilter_link_get_channels(). Use av_buffersink_get_channels(). |
| 20 | 24 | |
| @@ -986,12 +986,15 @@ typedef struct AVStream { · 985 unmodified lines | ||
| 986 | 986 | */ |
| 987 | 987 | AVRational r_frame_rate; |
| 988 | 988 | |
| 989 | +#if FF_API_LAVF_FFSERVER | |
| 989 | 990 | /** |
| 990 | 991 | * String containing pairs of key and values describing recommended encoder configuration. |
| 991 | 992 | * Pairs are separated by ','. |
| 992 | 993 | * Keys are separated from values by '='. |
| 993 | 994 | */ |
| 995 | + attribute_deprecated | |
| 994 | 996 | char *recommended_encoder_configuration; |
| 997 | +#endif | |
| 995 | 998 | |
| 996 | 999 | /** |
| 997 | 1000 | * Codec parameters associated with this stream. Allocated and freed by |
| @@ -1218,10 +1221,12 @@ AVRational av_stream_get_r_frame_rate(const AVStream *s); · 220 unmodified lines | ||
| 1218 | 1221 | attribute_deprecated |
| 1219 | 1222 | void av_stream_set_r_frame_rate(AVStream *s, AVRational r); |
| 1220 | 1223 | attribute_deprecated |
| 1224 | +#if FF_API_LAVF_FFSERVER | |
| 1221 | 1225 | char* av_stream_get_recommended_encoder_configuration(const AVStream *s); |
| 1222 | 1226 | attribute_deprecated |
| 1223 | 1227 | void av_stream_set_recommended_encoder_configuration(AVStream *s, char *configuration); |
| 1224 | 1228 | #endif |
| 1229 | +#endif | |
| 1225 | 1230 | |
| 1226 | 1231 | struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); |
| 1227 | 1232 | |
| @@ -119,7 +119,11 @@ static int64_t wrap_timestamp(const AVStream *st, int64_t timestamp) · 118 unmodified lines | ||
| 119 | 119 | |
| 120 | 120 | #if FF_API_FORMAT_GET_SET |
| 121 | 121 | MAKE_ACCESSORS(AVStream, stream, AVRational, r_frame_rate) |
| 122 | +#if FF_API_LAVF_FFSERVER | |
| 123 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 122 | 124 | MAKE_ACCESSORS(AVStream, stream, char *, recommended_encoder_configuration) |
| 125 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 126 | +#endif | |
| 123 | 127 | MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, video_codec) |
| 124 | 128 | MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, audio_codec) |
| 125 | 129 | MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, subtitle_codec) |
| @@ -4256,6 +4260,8 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src) · 4130 unmodified lines | ||
| 4256 | 4260 | } |
| 4257 | 4261 | } |
| 4258 | 4262 | |
| 4263 | +#if FF_API_LAVF_FFSERVER | |
| 4264 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 4259 | 4265 | av_freep(&dst->recommended_encoder_configuration); |
| 4260 | 4266 | if (src->recommended_encoder_configuration) { |
| 4261 | 4267 | const char *conf_str = src->recommended_encoder_configuration; |
| @@ -4263,6 +4269,8 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src) · 1 unmodified line | ||
| 4263 | 4269 | if (!dst->recommended_encoder_configuration) |
| 4264 | 4270 | return AVERROR(ENOMEM); |
| 4265 | 4271 | } |
| 4272 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 4273 | +#endif | |
| 4266 | 4274 | |
| 4267 | 4275 | return 0; |
| 4268 | 4276 | } |
| @@ -4310,7 +4318,11 @@ FF_ENABLE_DEPRECATION_WARNINGS · 41 unmodified lines | ||
| 4310 | 4318 | if (st->info) |
| 4311 | 4319 | av_freep(&st->info->duration_error); |
| 4312 | 4320 | av_freep(&st->info); |
| 4321 | +#if FF_API_LAVF_FFSERVER | |
| 4322 | +FF_DISABLE_DEPRECATION_WARNINGS | |
| 4313 | 4323 | av_freep(&st->recommended_encoder_configuration); |
| 4324 | +FF_ENABLE_DEPRECATION_WARNINGS | |
| 4325 | +#endif | |
| 4314 | 4326 | |
| 4315 | 4327 | av_freep(pst); |
| 4316 | 4328 | } |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) |
| 33 | 33 | // Also please add any ticket numbers that you believe might be affected here |
| 34 | 34 | #define LIBAVFORMAT_VERSION_MAJOR 58 |
| 35 | −#define LIBAVFORMAT_VERSION_MINOR 3 | |
| 35 | +#define LIBAVFORMAT_VERSION_MINOR 4 | |
| 36 | 36 | #define LIBAVFORMAT_VERSION_MICRO 100 |
| 37 | 37 | |
| 38 | 38 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| @@ -82,6 +82,9 @@ · 43 unmodified lines | ||
| 82 | 82 | #ifndef FF_API_OLD_AVIO_EOF_0 |
| 83 | 83 | #define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) |
| 84 | 84 | #endif |
| 85 | +#ifndef FF_API_LAVF_FFSERVER | |
| 86 | +#define FF_API_LAVF_FFSERVER (LIBAVFORMAT_VERSION_MAJOR < 59) | |
| 87 | +#endif | |
| 85 | 88 | |
| 86 | 89 | |
| 87 | 90 | #ifndef FF_API_R_FRAME_RATE |