diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-07 18:55:18 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-07 18:59:43 -0300 |
| commit | ff55b62a65474714737a553c42f1620df3c9cf31 (patch) | |
| tree | 9ad431500180c914709f6044e42283e141ecb033 | |
| parent | e5841b22ca83d9e300752d7ce6b4abfa4d509024 (diff) | |
| parent | 15f1cc09a406cf6296818d475a256902235eefc4 (diff) | |
| download | ffmpeg-ff55b62a65474714737a553c42f1620df3c9cf31.tar.gz | |
Merge commit '15f1cc09a406cf6296818d475a256902235eefc4'
* commit '15f1cc09a406cf6296818d475a256902235eefc4':
flac: Postpone unlikely condition checks
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/flacdec.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 581c73efc8..567f6f88a7 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -225,15 +225,21 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order) int samples; method_type = get_bits(&s->gb, 2); + rice_order = get_bits(&s->gb, 4); + + samples = s->blocksize >> rice_order; + rice_bits = 4 + method_type; + rice_esc = (1 << rice_bits) - 1; + + decoded += pred_order; + i = pred_order; + if (method_type > 1) { av_log(s->avctx, AV_LOG_ERROR, "illegal residual coding method %d\n", method_type); return AVERROR_INVALIDDATA; } - rice_order = get_bits(&s->gb, 4); - - samples= s->blocksize >> rice_order; if (samples << rice_order != s->blocksize) { av_log(s->avctx, AV_LOG_ERROR, "invalid rice order: %i blocksize %i\n", rice_order, s->blocksize); @@ -246,11 +252,6 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order) return AVERROR_INVALIDDATA; } - rice_bits = 4 + method_type; - rice_esc = (1 << rice_bits) - 1; - - decoded += pred_order; - i= pred_order; for (partition = 0; partition < (1 << rice_order); partition++) { tmp = get_bits(&s->gb, rice_bits); if (tmp == rice_esc) { |