[FFmpeg-cvslog] avcodec/svq3: Use skip_1stop_8data_bits()

Michael Niedermayer git at videolan.org
Wed Oct 30 18:35:37 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 30 18:28:00 2013 +0100| [9c7662aeba9908bf2892ba034686d5c93539b291] | committer: Michael Niedermayer

avcodec/svq3: Use skip_1stop_8data_bits()

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

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

 libavcodec/svq3.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 1c8e1ec..a717e9d 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -838,8 +838,8 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
     skip_bits1(&h->gb);
     skip_bits(&h->gb, 2);
 
-    while (get_bits1(&h->gb))
-        skip_bits(&h->gb, 8);
+    if (skip_1stop_8data_bits(&h->gb) < 0)
+        return AVERROR_INVALIDDATA;
 
     /* reset intra predictors and invalidate motion vector references */
     if (h->mb_x > 0) {
@@ -970,8 +970,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
         /* unknown field */
         skip_bits1(&gb);
 
-        while (get_bits1(&gb))
-            skip_bits(&gb, 8);
+        if (skip_1stop_8data_bits(&gb) < 0)
+            return AVERROR_INVALIDDATA;
 
         s->unknown_flag  = get_bits1(&gb);
         avctx->has_b_frames = !h->low_delay;



More information about the ffmpeg-cvslog mailing list