[FFmpeg-cvslog] rtjpeg: Use init_get_bits8

Luca Barbato git at videolan.org
Tue Aug 27 19:23:50 CEST 2013


ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Tue Aug 13 07:05:28 2013 +0200| [cea1769fb62bd3356b19d32c46483883f16334c4] | committer: Luca Barbato

rtjpeg: Use init_get_bits8

CC:libav-stable at libav.org
(cherry picked from commit f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

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

 libavcodec/rtjpeg.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c
index 3604585..77baa5b 100644
--- a/libavcodec/rtjpeg.c
+++ b/libavcodec/rtjpeg.c
@@ -108,10 +108,13 @@ int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
                                   const uint8_t *buf, int buf_size) {
     GetBitContext gb;
     int w = c->w / 16, h = c->h / 16;
-    int x, y;
+    int x, y, ret;
     uint8_t *y1 = f->data[0], *y2 = f->data[0] + 8 * f->linesize[0];
     uint8_t *u = f->data[1], *v = f->data[2];
-    init_get_bits(&gb, buf, buf_size * 8);
+
+    if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0)
+        return ret;
+
     for (y = 0; y < h; y++) {
         for (x = 0; x < w; x++) {
 #define BLOCK(quant, dst, stride) do { \



More information about the ffmpeg-cvslog mailing list