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/ac3dec.c | |
| parent | 2c1c0c5024f8e82200874762cbeeda494875b7e3 (diff) | |
| parent | e83c2ddebf8ee90086d8e34de9c8ba245f548f89 (diff) | |
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/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 9d1611f226..6bc50192ee 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1463,7 +1463,7 @@ static const AVOption options[] = { }; static const AVClass ac3_decoder_class = { - .class_name = "(E-)AC3 decoder", + .class_name = "AC3 decoder", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, @@ -1485,6 +1485,12 @@ AVCodec ff_ac3_decoder = { }; #if CONFIG_EAC3_DECODER +static const AVClass eac3_decoder_class = { + .class_name = "E-AC3 decoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; AVCodec ff_eac3_decoder = { .name = "eac3", .type = AVMEDIA_TYPE_AUDIO, @@ -1497,6 +1503,6 @@ AVCodec ff_eac3_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .priv_class = &ac3_decoder_class, + .priv_class = &eac3_decoder_class, }; #endif |