[FFmpeg-cvslog] escape130: replace can_safely_read() by get_bits_left()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  8 13:50:25 2011 +0100| [bef8dfa0568a0c8207c440fd90c8a66c1772bd1f] | committer: Michael Niedermayer

escape130: replace can_safely_read() by get_bits_left()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bef8dfa0568a0c8207c440fd90c8a66c1772bd1f
---

 libavcodec/escape130.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
index be5327c..5adfefa 100644
--- a/libavcodec/escape130.c
+++ b/libavcodec/escape130.c
@@ -29,10 +29,6 @@ typedef struct Escape130Context {
     uint8_t *bases;
 } Escape130Context;
 
-static int can_safely_read(GetBitContext* gb, int bits) {
-    return get_bits_count(gb) + bits <= gb->size_in_bits;
-}
-
 /**
  * Initialize the decoder
  * @param avctx decoder context
@@ -69,7 +65,7 @@ static unsigned decode_skip_count(GetBitContext* gb) {
     unsigned value;
     // This function reads a maximum of 27 bits,
     // which is within the padding space
-    if (!can_safely_read(gb, 1+3))
+    if (get_bits_left(gb) < 1+3)
         return -1;
 
     value = get_bits1(gb);
@@ -126,7 +122,7 @@ static int escape130_decode_frame(AVCodecContext *avctx,
 
     init_get_bits(&gb, buf, buf_size * 8);
 
-    if (!can_safely_read(&gb, 128))
+    if (get_bits_left(&gb) < 128)
         return -1;
 
     // Header; no useful information in here