diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-01 00:21:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-01 00:26:05 +0200 |
| commit | ffb5a0d533498102c31aa131bc91a4cce868b0a8 (patch) | |
| tree | 1c78494488bab5bafa3bda2ab20295f13860fc2e /libavformat/mp3enc.c | |
| parent | 1a9f9f81b1244b952126bb65bc741b04d3534f81 (diff) | |
| parent | 85770f2a2651497861ed938efcd0df3696ff5e45 (diff) | |
Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'
* commit '85770f2a2651497861ed938efcd0df3696ff5e45':
AVOptions: make default_val a union, as proposed in AVOption2.
Move ff_dynarray_add to lavu and make it public.
lavf: remove duplicate assignment in avformat_alloc_context.
lavf: use designated initializers for AVClasses.
options: simplify av_find_opt by using av_next_option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mp3enc.c')
| -rw-r--r-- | libavformat/mp3enc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index a19769bbb0..dce3260a87 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -161,15 +161,15 @@ typedef struct MP3Context { static const AVOption options[] = { { "id3v2_version", "Select ID3v2 version to write. Currently 3 and 4 are supported.", - offsetof(MP3Context, id3v2_version), FF_OPT_TYPE_INT, 4, 3, 4, AV_OPT_FLAG_ENCODING_PARAM}, + offsetof(MP3Context, id3v2_version), FF_OPT_TYPE_INT, {.dbl = 4}, 3, 4, AV_OPT_FLAG_ENCODING_PARAM}, { NULL }, }; static const AVClass mp3_muxer_class = { - "MP3 muxer", - av_default_item_name, - options, - LIBAVUTIL_VERSION_INT, + .class_name = "MP3 muxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, }; static int id3v2_check_write_tag(AVFormatContext *s, AVMetadataTag *t, const char table[][4], |