From cf99e4aa00c4a74f3da5dd399c69da84fd176d4a Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 2 Jan 2011 10:52:34 +0000 Subject: Add AVOption support for muxers. Patch by Anssi Hannula, anssi d hannula a iki d fi Originally committed as revision 26195 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 4 +++- libavformat/utils.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/avformat.h b/libavformat/avformat.h index c6f2827..56a1946 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 91 +#define LIBAVFORMAT_VERSION_MINOR 92 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -368,6 +368,8 @@ typedef struct AVOutputFormat { const AVMetadataConv *metadata_conv; #endif + const AVClass *priv_class; ///< AVClass for the private context + /* private fields */ struct AVOutputFormat *next; } AVOutputFormat; diff --git a/libavformat/utils.c b/libavformat/utils.c index 6f994a1..e1928c4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2720,6 +2720,10 @@ int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap) s->priv_data = av_mallocz(s->oformat->priv_data_size); if (!s->priv_data) return AVERROR(ENOMEM); + if (s->oformat->priv_class) { + *(const AVClass**)s->priv_data= s->oformat->priv_class; + av_opt_set_defaults(s->priv_data); + } } else s->priv_data = NULL; -- cgit v1.1