diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-25 10:27:31 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-03-30 12:36:32 +0200 |
| commit | 67f6e7ed6ddac43139984b6956f45bb5c1861546 (patch) | |
| tree | a931d71df1442c32203715d2e6fa82a3fab6a4af /libavcodec/svq1enc.c | |
| parent | 11ff9cb5e976e87ec345e6f4856f62b86d6cb0b3 (diff) | |
avcodec: Remove cumbersome way of checking for amount of bytes left
Several encoders used code like the following to check for the amount of
bytes left in a PutBitContext:
pb->buf_end - pb->buf - (put_bits_count(pb) >> 3)
Besides the fact that using the pointers directly might pose
a maintainence burden in the future this also leads to suboptimal code:
The above code reads all three pointers (buf, buf_ptr and buf_end), but
touching buf is unnecessary and switching to put_bytes_left()
automatically fixes this.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/svq1enc.c')
| -rw-r--r-- | libavcodec/svq1enc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 4fac0c26e5..53f0b40a21 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -372,8 +372,7 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, int score[4] = { 0, 0, 0, 0 }, best; uint8_t *temp = s->scratchbuf; - if (s->pb.buf_end - s->pb.buf - - (put_bits_count(&s->pb) >> 3) < 3000) { // FIXME: check size + if (put_bytes_left(&s->pb, 0) < 3000) { // FIXME: check size av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); return -1; } |