---
doc/APIchanges | 4 ++++
libavformat/avformat.h | 2 ++
libavformat/utils.c | 8 ++++++++
libavformat/version.h | 5 ++++-
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index d66c842521..0184815224 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,10 @@ libavutil: 2017-10-21
API changes, most recent first:
+2018-01-xx - xxxxxxx - lavf 58.4.100 - avformat.h
+ Deprecate AVStream.recommended_encoder_configuration. It was useful only for
+ FFserver, which has been removed.
+
2018-01-xx - xxxxxxx - lavfi 7.11.101 - avfilter.h
Deprecate avfilter_link_get_channels(). Use av_buffersink_get_channels().
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4f2798a871..6f4b58b14b 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -986,12 +986,14 @@ typedef struct AVStream {
*/
AVRational r_frame_rate;
+#if FF_API_LAVF_FFSERVER
/**
* String containing pairs of key and values describing recommended
encoder configuration.
* Pairs are separated by ','.
* Keys are separated from values by '='.
*/
char *recommended_encoder_configuration;
+#endif
/**
* Codec parameters associated with this stream. Allocated and freed by
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2185a6f05b..1101c50de2 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4256,6 +4256,8 @@ int ff_stream_encode_params_copy(AVStream *dst, const
AVStream *src)
}
}
+#if FF_API_LAVF_FFSERVER
+FF_DISABLE_DEPRECATION_WARNINGS
av_freep(&dst->recommended_encoder_configuration);
if (src->recommended_encoder_configuration) {
const char *conf_str = src->recommended_encoder_configuration;
@@ -4263,6 +4265,8 @@ int ff_stream_encode_params_copy(AVStream *dst, const
AVStream *src)
if (!dst->recommended_encoder_configuration)
return AVERROR(ENOMEM);
}
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
return 0;
}
@@ -4310,7 +4314,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (st->info)
av_freep(&st->info->duration_error);
av_freep(&st->info);
+#if FF_API_LAVF_FFSERVER
+FF_DISABLE_DEPRECATION_WARNINGS
av_freep(&st->recommended_encoder_configuration);
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
av_freep(pst);
}
diff --git a/libavformat/version.h b/libavformat/version.h
index 5ced041f0a..d566e255e5 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@
// 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 3
+#define LIBAVFORMAT_VERSION_MINOR 4
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@@ -82,6 +82,9 @@
#ifndef FF_API_OLD_AVIO_EOF_0
#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
+#ifndef FF_API_LAVF_FFSERVER
+#define FF_API_LAVF_FFSERVER (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
#ifndef FF_API_R_FRAME_RATE
--
2.15.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
