diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2008-04-29 18:32:06 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2008-04-29 18:32:06 +0000 |
commit | 0dfea024e16961a8f3d96ea818a2d5bd5a35d804 (patch) | |
tree | da30ae247cf0c45d274ef519e1a11546e08dd5b0 /libavcodec | |
parent | ef79ef3c1101b238700438f1aed15ecf8b1d6699 (diff) | |
download | ffmpeg-0dfea024e16961a8f3d96ea818a2d5bd5a35d804.tar.gz |
indent
Originally committed as revision 13021 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/libgsm.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 01e58d7a62..91b956fd4c 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -49,20 +49,20 @@ static av_cold int libgsm_init(AVCodecContext *avctx) { if(!avctx->sample_rate) avctx->sample_rate= 8000; }else{ - 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_INOFFICIAL) - 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_INOFFICIAL) - 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_INOFFICIAL) + 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_INOFFICIAL) + return -1; + } } avctx->priv_data = gsm_create(); |