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/libopusdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ffmpeg/libavcodec/libopusdec.c') diff --git a/ffmpeg/libavcodec/libopusdec.c b/ffmpeg/libavcodec/libopusdec.c index 9b5cfe7..8436302 100644 --- a/ffmpeg/libavcodec/libopusdec.c +++ b/ffmpeg/libavcodec/libopusdec.c @@ -108,8 +108,8 @@ static av_cold int libopus_decode_init(AVCodecContext *avc) } #endif - avc->internal->skip_samples = opus->pre_skip; - avc->delay = 3840; /* Decoder delay (in samples) at 48kHz */ + /* Decoder delay (in samples) at 48kHz */ + avc->delay = avc->internal->skip_samples = opus->pre_skip; return 0; } @@ -183,6 +183,7 @@ static void libopus_flush(AVCodecContext *avc) AVCodec ff_libopus_decoder = { .name = "libopus", + .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_OPUS, .priv_data_size = sizeof(struct libopus_context), @@ -191,7 +192,6 @@ AVCodec ff_libopus_decoder = { .decode = libopus_decode, .flush = libopus_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, -- cgit v1.2.3