Mercurial > libavcodec.hg

comparison g726.c @ 2658:d1609cfeb1d0 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
author michael
date Sun, 08 May 2005 20:15:42 +0000
parents 582e635cfa08
children ef2149182f1c
comparison
equal deleted inserted replaced
2657:24472383b36f 2658:d1609cfeb1d0
325 (avctx->bit_rate != 16000 && avctx->bit_rate != 24000 && 325 (avctx->bit_rate != 16000 && avctx->bit_rate != 24000 &&
326 avctx->bit_rate != 32000 && avctx->bit_rate != 40000)) { 326 avctx->bit_rate != 32000 && avctx->bit_rate != 40000)) {
327 av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n"); 327 av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n");
328 return -1; 328 return -1;
329 } 329 }
330 if (avctx->sample_rate != 8000 && avctx->strict_std_compliance>=0) { 330 if (avctx->sample_rate != 8000 && avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL) {
331 av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n"); 331 av_log(avctx, AV_LOG_ERROR, "G726: unsupported audio format\n");
332 return -1; 332 return -1;
333 } 333 }
334 g726_reset(&c->c, avctx->bit_rate); 334 g726_reset(&c->c, avctx->bit_rate);
335 c->code_size = c->c.tbls->bits; 335 c->code_size = c->c.tbls->bits;