[FFmpeg-cvslog] cljr: simplify CLJRContext

[Paul B. Mahol]

ffmpeg | branch: master | Paul B. Mahol <onemda at gmail.com> | Tue Dec  6 17:45:37 2011 +0000| [fc9489f6adb9d3e790e6e5ebe984eaee0c733b09] | committer: Janne Grunau

 cljr: simplify CLJRContext

There is no need to have delta, offset and gb in CLJRContext.

Signed-off-by: Janne Grunau <janne-libav at jannau.net>

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

 libavcodec/cljr.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 2bfe035..e8d818a 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -35,9 +35,6 @@
 typedef struct CLJRContext{
     AVCodecContext *avctx;
     AVFrame picture;
-    int delta[16];
-    int offset[4];
-    GetBitContext gb;
 } CLJRContext;
 
 static int decode_frame(AVCodecContext *avctx,
@@ -47,6 +44,7 @@ static int decode_frame(AVCodecContext *avctx,
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
     CLJRContext * const a = avctx->priv_data;
+    GetBitContext gb;
     AVFrame *picture = data;
     AVFrame * const p= (AVFrame*)&a->picture;
     int x, y;
@@ -67,20 +65,20 @@ static int decode_frame(AVCodecContext *avctx,
     p->pict_type= AV_PICTURE_TYPE_I;
     p->key_frame= 1;
 
-    init_get_bits(&a->gb, buf, buf_size * 8);
+    init_get_bits(&gb, buf, buf_size * 8);
 
     for(y=0; y<avctx->height; y++){
         uint8_t *luma= &a->picture.data[0][ y*a->picture.linesize[0] ];
         uint8_t *cb= &a->picture.data[1][ y*a->picture.linesize[1] ];
         uint8_t *cr= &a->picture.data[2][ y*a->picture.linesize[2] ];
         for(x=0; x<avctx->width; x+=4){
-                luma[3] = get_bits(&a->gb, 5) << 3;
-            luma[2] = get_bits(&a->gb, 5) << 3;
-            luma[1] = get_bits(&a->gb, 5) << 3;
-            luma[0] = get_bits(&a->gb, 5) << 3;
+            luma[3] = get_bits(&gb, 5) << 3;
+            luma[2] = get_bits(&gb, 5) << 3;
+            luma[1] = get_bits(&gb, 5) << 3;
+            luma[0] = get_bits(&gb, 5) << 3;
             luma+= 4;
-            *(cb++) = get_bits(&a->gb, 6) << 2;
-            *(cr++) = get_bits(&a->gb, 6) << 2;
+            *(cb++) = get_bits(&gb, 6) << 2;
+            *(cr++) = get_bits(&gb, 6) << 2;
         }
     }