| Message ID | 20231211014429.1841681-17-u@pkh.me |
|---|---|
| State | Accepted |
| Commit | 8e42d3aba01e901bd99a95197714fe5b96d2fea8 |
| Headers | show |
| Series | [FFmpeg-devel,01/35] avcodec/proresenc_kostya: remove an unnecessary parenthesis level in MAKE_CODE() macro | expand |
On date Monday 2023-12-11 02:35:17 +0100, Clément Bœsch wrote: > This makes the function closer to encode_dcs() in proresenc_kostya. > --- > libavcodec/proresenc_anatoliy.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c > index e79c465590..f8feff850f 100644 > --- a/libavcodec/proresenc_anatoliy.c > +++ b/libavcodec/proresenc_anatoliy.c > @@ -285,9 +285,9 @@ static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, > diff_sign = DIFF_SIGN(delta, sign); > code = TO_GOLOMB2(get_level(delta), diff_sign); > > - encode_vlc_codeword(pb, ff_prores_dc_codebook[FFMIN(codebook, 6)], code); > + encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); > > - codebook = code; > + codebook = FFMIN(code, 6); > sign = delta >> 31; > prev_dc = new_dc; should be good, assuming that codebook in the first run is 5
diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index e79c465590..f8feff850f 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -285,9 +285,9 @@ static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, diff_sign = DIFF_SIGN(delta, sign); code = TO_GOLOMB2(get_level(delta), diff_sign); - encode_vlc_codeword(pb, ff_prores_dc_codebook[FFMIN(codebook, 6)], code); + encode_vlc_codeword(pb, ff_prores_dc_codebook[codebook], code); - codebook = code; + codebook = FFMIN(code, 6); sign = delta >> 31; prev_dc = new_dc; }