On Sun, Apr 16, 2017 at 09:19:33AM -0400, Ruyi Ji wrote:
> Signed-off-by: Ruyi Ji <jiru...@gmail.com>
> ---
>  libavcodec/psymodel.c        |   1 +
>  libavcodec/vorbis_enc_data.h | 111 
> +++++++++++++++++++++++++++++++++++++++++++
>  libavcodec/vorbisenc.c       |  60 +++++++++++++++++++++++
>  3 files changed, 172 insertions(+)

This seems to fail to build here

CC      libavcodec/vorbisenc.o
libavcodec/vorbisenc.c:133:45: error: ‘MAX_CHANNELS’ undeclared here (not in a 
function)
libavcodec/vorbisenc.c: In function ‘vorbis_encode_frame’:
libavcodec/vorbisenc.c:1057:25: error: expected ‘;’ before ‘if’
libavcodec/vorbisenc.c: In function ‘vorbis_encode_close’:
libavcodec/vorbisenc.c:1196:9: error: incompatible type for argument 1 of 
‘ff_psy_end’
libavcodec/psymodel.h:176:6: note: expected ‘struct FFPsyContext *’ but 
argument is of type ‘FFPsyContext’
make: *** [libavcodec/vorbisenc.o] Error 1
make: Target `all' not remade because of errors.


> 
> diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c
> index 2b5f111..2e11c48 100644
> --- a/libavcodec/psymodel.c
> +++ b/libavcodec/psymodel.c
> @@ -62,6 +62,7 @@ av_cold int ff_psy_init(FFPsyContext *ctx, AVCodecContext 
> *avctx, int num_lens,
>  
>      switch (ctx->avctx->codec_id) {
>      case AV_CODEC_ID_AAC:
> +     case AV_CODEC_ID_VORBIS:
>          ctx->model = &ff_aac_psy_model;

tabs are forbidden in ffmpeg-git except where needed for syntax

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In fact, the RIAA has been known to suggest that students drop out
of college or go to community college in order to be able to afford
settlements. -- The RIAA

Attachment: signature.asc
Description: Digital signature

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to