diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 21:18:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 21:18:17 +0200 |
| commit | b00e56bec5f8aea788f3565cec09bcfea0aa4a53 (patch) | |
| tree | 2a69a4813dee01269febde30bf5bcdc2c14e9452 /libavcodec/g726.c | |
| parent | 247425241cb3b2b76df1c2aced5ce0d56126b82d (diff) | |
| parent | f803e0dc0e75997ecb696521cd68d8aeb3cdac40 (diff) | |
| download | ffmpeg-b00e56bec5f8aea788f3565cec09bcfea0aa4a53.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Support compilation on aix with gcc.
Rename "AVClass class" as "AVClass component_class".
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
Rename constant HZ in af_biquads.c as HERTZ.
Drop local lable from ppc asm timer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g726.c')
| -rw-r--r-- | libavcodec/g726.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 58d046817c..7884f36189 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -368,7 +368,7 @@ static const AVOption options[] = { { NULL }, }; -static const AVClass class = { +static const AVClass g726_class = { .class_name = "g726", .item_name = av_default_item_name, .option = options, @@ -391,7 +391,7 @@ AVCodec ff_adpcm_g726_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), - .priv_class = &class, + .priv_class = &g726_class, .defaults = defaults, }; #endif |