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/xsubenc.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/xsubenc.c')
-rw-r--r-- | libavcodec/xsubenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c index ad7144db2d..36c5ab7223 100644 --- a/libavcodec/xsubenc.c +++ b/libavcodec/xsubenc.c @@ -63,7 +63,7 @@ static int xsub_encode_rle(PutBitContext *pb, const uint8_t *bitmap, x0 = 0; while (x0 < w) { // Make sure we have enough room for at least one run and padding - if (pb->size_in_bits - put_bits_count(pb) < 7*8) + if (put_bytes_left(pb, 1) < 7) return AVERROR_BUFFER_TOO_SMALL; x1 = x0; |