Skip to content

F
ffmpeg
Commit bef8dfa0 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

escape130: replace can_safely_read() by get_bits_left() 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent f7da1235
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
libavcodec/escape130.c
View file @ bef8dfa0
...@@ -29,10 +29,6 @@ typedef struct Escape130Context { ...@@ -29,10 +29,6 @@ typedef struct Escape130Context {
uint8_t *bases; uint8_t *bases;
} Escape130Context; } Escape130Context;
static int can_safely_read(GetBitContext* gb, int bits) {
return get_bits_count(gb) + bits <= gb->size_in_bits;
}
/** /**
* Initialize the decoder * Initialize the decoder
* @param avctx decoder context * @param avctx decoder context
...@@ -69,7 +65,7 @@ static unsigned decode_skip_count(GetBitContext* gb) { ...@@ -69,7 +65,7 @@ static unsigned decode_skip_count(GetBitContext* gb) {
unsigned value; unsigned value;
// This function reads a maximum of 27 bits, // This function reads a maximum of 27 bits,
// which is within the padding space // which is within the padding space
if (!can_safely_read(gb, 1+3)) if (get_bits_left(gb) < 1+3)
return -1; return -1;
value = get_bits1(gb); value = get_bits1(gb);
...@@ -126,7 +122,7 @@ static int escape130_decode_frame(AVCodecContext *avctx, ...@@ -126,7 +122,7 @@ static int escape130_decode_frame(AVCodecContext *avctx,
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
if (!can_safely_read(&gb, 128)) if (get_bits_left(&gb) < 128)
return -1; return -1;
// Header; no useful information in here // Header; no useful information in here
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment