initial commit for Id RoQ and Interplay MVE multimedia subsystems

[ffmpeg] / libavcodec / cljr.c

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 4611d610046373ed8d1bdd5b7ade79e3cfe9cdf3..c7c614ebc237485e5041d98b0a6f24d683715cb4 100644 (file)
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -41,8 +41,7 @@ static int decode_frame(AVCodecContext *avctx,
     CLJRContext * const a = avctx->priv_data;
     AVFrame *picture = data;
     AVFrame * const p= (AVFrame*)&a->picture;
-    uint8_t *bytestream= buf;
-    int i, x, y;
+    int x, y;
 
     *data_size = 0;
 
@@ -65,11 +64,9 @@ static int decode_frame(AVCodecContext *avctx,
     init_get_bits(&a->gb, buf, buf_size);
 
     for(y=0; y<avctx->height; y++){
-        int offset;
         uint8_t *luma= &a->picture.data[0][ y*a->picture.linesize[0] ];
-        uint8_t *cb= &a->picture.data[1][ (y>>2)*a->picture.linesize[1] ];
-        uint8_t *cr= &a->picture.data[2][ (y>>2)*a->picture.linesize[2] ];
-
+        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;
@@ -121,28 +118,22 @@ static void common_init(AVCodecContext *avctx){
 }
 
 static int decode_init(AVCodecContext *avctx){
-    CLJRContext * const a = avctx->priv_data;
-    AVFrame *p= (AVFrame*)&a->picture;
-    int i;
- 
+
     common_init(avctx);
     
-    avctx->pix_fmt= PIX_FMT_YUV410P;
+    avctx->pix_fmt= PIX_FMT_YUV411P;
 
     return 0;
 }
 
 static int encode_init(AVCodecContext *avctx){
-    CLJRContext * const a = avctx->priv_data;
-    int i;
- 
+
     common_init(avctx);
     
     return 0;
 }
 
 static int decode_end(AVCodecContext *avctx){
-    CLJRContext * const a = avctx->priv_data;
 
     avcodec_default_free_buffers(avctx);