On Thu, 22 Sep 2011 15:06:36 -0400, Justin Ruggles <[email protected]> wrote: > --- > libavcodec/libgsm.c | 28 ++++++++++++++-------------- > 1 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c > index afbeba1..951e736 100644 > --- a/libavcodec/libgsm.c > +++ b/libavcodec/libgsm.c > @@ -42,20 +42,20 @@ static av_cold int libgsm_encode_init(AVCodecContext > *avctx) { > return -1; > } > > - if (avctx->sample_rate != 8000) { > - av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for > GSM, got %dHz\n", > - avctx->sample_rate); > - if(avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) > - return -1; > - } > - if (avctx->bit_rate != 13000 /* Official */ && > - avctx->bit_rate != 13200 /* Very common */ && > - avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate > when decoding */ ) { > - av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, > got %dbps\n", > - avctx->bit_rate); > - if(avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) > - return -1; > - } > + if (avctx->sample_rate != 8000) { > + av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, > got %dHz\n", > + avctx->sample_rate); > + if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) > + return -1; > + } > + if (avctx->bit_rate != 13000 /* Official */ && > + avctx->bit_rate != 13200 /* Very common */ && > + avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when > decoding */ ) { > + av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got > %dbps\n", > + avctx->bit_rate); > + if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) > + return -1; > + } >
Might as well return AVERROR(EINVAL) while you're at it. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
