diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
| commit | f7813a5324be39d13ab536c245d15dfc602a7849 (patch) | |
| tree | fad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavcodec/g723_1.c | |
| parent | b7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff) | |
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/g723_1.c')
| -rw-r--r-- | ffmpeg/libavcodec/g723_1.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ffmpeg/libavcodec/g723_1.c b/ffmpeg/libavcodec/g723_1.c index 6254c9a..09da766 100644 --- a/ffmpeg/libavcodec/g723_1.c +++ b/ffmpeg/libavcodec/g723_1.c @@ -30,7 +30,6 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "avcodec.h" -#include "internal.h" #include "get_bits.h" #include "acelp_vectors.h" #include "celp_filters.h" @@ -1332,12 +1331,12 @@ static const AVClass g723_1dec_class = { AVCodec ff_g723_1_decoder = { .name = "g723_1", + .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_G723_1, .priv_data_size = sizeof(G723_1_Context), .init = g723_1_decode_init, .decode = g723_1_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, .priv_class = &g723_1dec_class, }; @@ -2466,12 +2465,12 @@ static int g723_1_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, AVCodec ff_g723_1_encoder = { .name = "g723_1", + .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_G723_1, .priv_data_size = sizeof(G723_1_Context), .init = g723_1_encode_init, .encode2 = g723_1_encode_frame, - .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE}, }; |