Mercurial > libavcodec.hg

comparison libgsm.c @ 12084:b6cf19580e47 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change all occurences of "inofficial" to "unofficial" in code, comments and options. Keep old options until next major version bump. Patch by Rodney Baker, rodney d baker a iinet d net d au
author cehoyos
date Sat, 03 Jul 2010 15:35:23 +0000
parents 7dd2a45249a9
children
comparison
equal deleted inserted replaced
12083:dd5efc28bca9 12084:b6cf19580e47
52 avctx->sample_fmt = SAMPLE_FMT_S16; 52 avctx->sample_fmt = SAMPLE_FMT_S16;
53 }else{ 53 }else{
54 if (avctx->sample_rate != 8000) { 54 if (avctx->sample_rate != 8000) {
55 av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n", 55 av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
56 avctx->sample_rate); 56 avctx->sample_rate);
57 if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL) 57 if(avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
58 return -1; 58 return -1;
59 } 59 }
60 if (avctx->bit_rate != 13000 /* Official */ && 60 if (avctx->bit_rate != 13000 /* Official */ &&
61 avctx->bit_rate != 13200 /* Very common */ && 61 avctx->bit_rate != 13200 /* Very common */ &&
62 avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) { 62 avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
63 av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n", 63 av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
64 avctx->bit_rate); 64 avctx->bit_rate);
65 if(avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL) 65 if(avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
66 return -1; 66 return -1;
67 } 67 }
68 } 68 }
69 69
70 avctx->priv_data = gsm_create(); 70 avctx->priv_data = gsm_create();