diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-22 14:04:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-22 14:04:44 +0200 |
| commit | 8364bde02b24c26f4fd7e154149293c10ad8389a (patch) | |
| tree | f669f19752f56a31b397229569e231a195f7ab51 /libavcodec/sipr.c | |
| parent | 79bf1f0ad03f17bb00913fdef6e955d3c46c8a92 (diff) | |
| parent | c54e00610f20d2342fe9b17a5460abfbd411c8fb (diff) | |
| download | ffmpeg-8364bde02b24c26f4fd7e154149293c10ad8389a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sipr: fall back to setting mode based on bit_rate.
Conflicts:
libavcodec/sipr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
| -rw-r--r-- | libavcodec/sipr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index c95f5fe2a5..fc03259b0b 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -485,11 +485,13 @@ static av_cold int sipr_decoder_init(AVCodecContext * avctx) case 29: ctx->mode = MODE_6k5; break; case 37: ctx->mode = MODE_5k0; break; default: - av_log(avctx, AV_LOG_ERROR, "Invalid block_align: %d\n", avctx->block_align); if (avctx->bit_rate > 12200) ctx->mode = MODE_16k; else if (avctx->bit_rate > 7500 ) ctx->mode = MODE_8k5; else if (avctx->bit_rate > 5750 ) ctx->mode = MODE_6k5; else ctx->mode = MODE_5k0; + av_log(avctx, AV_LOG_WARNING, + "Invalid block_align: %d. Mode %s guessed based on bitrate: %d\n", + avctx->block_align, modes[ctx->mode].mode_name, avctx->bit_rate); } av_log(avctx, AV_LOG_DEBUG, "Mode: %s\n", modes[ctx->mode].mode_name); |