---
libavformat/mux.c | 14 ++++++++++++++
libavformat/version.h | 3 +++
2 files changed, 17 insertions(+)
diff --git a/libavformat/mux.c b/libavformat/mux.c
index dde7596..fd97b59 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -126,6 +126,20 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
#endif
+#if FF_API_LAVF_AVCTX
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (st->codecparam->codec_type == AVMEDIA_TYPE_UNKNOWN &&
+ st->codec->codec_type != AVMEDIA_TYPE_UNKNOWN) {
+ av_log(s, AV_LOG_WARNING, "Using AVStream.codec to pass codec "
+ "parameters to muxers is deprecated, use AVStream.codecpar "
+ "instead.\n");
+ ret = avcodec_parameters_from_context(st->codecparam, st->codec);
+ if (ret < 0)
+ goto fail;
+ }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
if (!st->time_base.num) {
/* fall back on the default timebase values */
if (codec->codec_type == AVMEDIA_TYPE_AUDIO && codec->sample_rate)
diff --git a/libavformat/version.h b/libavformat/version.h
index 7b1acd6..e48d806 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -57,5 +57,8 @@
#ifndef FF_API_LAVF_CODEC_TB
#define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 57)
#endif
+#ifndef FF_API_LAVF_AVCTX
+#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58)
+#endif
#endif /* AVFORMAT_VERSION_H */
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
