diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 03:42:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 03:42:14 +0200 |
| commit | 6638207bce4eabd3f99295c1ab096d2815eff3ce (patch) | |
| tree | 7ffc8358858c6628812a7514dc6e11d02083b2e2 /libavcodec/options.c | |
| parent | 2c1c0c5024f8e82200874762cbeeda494875b7e3 (diff) | |
| parent | e83c2ddebf8ee90086d8e34de9c8ba245f548f89 (diff) | |
| download | ffmpeg-6638207bce4eabd3f99295c1ab096d2815eff3ce.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix 'heigth' vs. 'height' typos.
lavc/lavf: use unique private classes.
lavc: use designated initializers for av_codec_context_class
Conflicts:
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 3df64cd978..d412a94acb 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -517,7 +517,14 @@ static const AVOption options[]={ #undef D #undef DEFAULT -static const AVClass av_codec_context_class = { "AVCodecContext", context_to_name, options, LIBAVUTIL_VERSION_INT, OFFSET(log_level_offset), .opt_find = opt_find}; +static const AVClass av_codec_context_class = { + .class_name = "AVCodecContext", + .item_name = context_to_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, + .log_level_offset_offset = OFFSET(log_level_offset), + .opt_find = opt_find, +}; void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){ int flags=0; |