From f7813a5324be39d13ab536c245d15dfc602a7849 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 29 Dec 2013 12:19:38 +0000 Subject: basic type mechanism working --- ffmpeg/libavcodec/libvorbisenc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ffmpeg/libavcodec/libvorbisenc.c') diff --git a/ffmpeg/libavcodec/libvorbisenc.c b/ffmpeg/libavcodec/libvorbisenc.c index d3f86cc..fd788b7 100644 --- a/ffmpeg/libavcodec/libvorbisenc.c +++ b/ffmpeg/libavcodec/libvorbisenc.c @@ -41,7 +41,6 @@ typedef struct OggVorbisEncContext { AVClass *av_class; /**< class for AVOptions */ - AVFrame frame; vorbis_info vi; /**< vorbis_info used during init */ vorbis_dsp_state vd; /**< DSP state used for analysis */ vorbis_block vb; /**< vorbis_block used for analysis */ @@ -64,7 +63,7 @@ static const AVCodecDefault defaults[] = { { NULL }, }; -static const AVClass class = { +static const AVClass vorbis_class = { .class_name = "libvorbis", .item_name = av_default_item_name, .option = options, @@ -363,6 +362,7 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_libvorbis_encoder = { .name = "libvorbis", + .long_name = NULL_IF_CONFIG_SMALL("libvorbis"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VORBIS, .priv_data_size = sizeof(OggVorbisEncContext), @@ -372,7 +372,6 @@ AVCodec ff_libvorbis_encoder = { .capabilities = CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("libvorbis"), - .priv_class = &class, + .priv_class = &vorbis_class, .defaults = defaults, }; -- cgit v1.2.3