10l, non-x86 fix

[ffmpeg] / libavcodec / mdec.c

diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index 2ad70c2702def52731d01a4b6905d7395e384c21..ef4e6ec0a9a3f7b2e3208b1f41dcb1a20688767a 100644 (file)
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -110,7 +110,7 @@ static inline int mdec_decode_block_intra(MDECContext *a, DCTELEM *block, int n)
                 }
             }
             if (i > 63){
-                fprintf(stderr, "ac-tex damaged at %d %d\n", a->mb_x, a->mb_y);
+                av_log(a->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", a->mb_x, a->mb_y);
                 return -1;
             }
 
@@ -124,7 +124,7 @@ static inline int mdec_decode_block_intra(MDECContext *a, DCTELEM *block, int n)
 
 static inline int decode_mb(MDECContext *a, DCTELEM block[6][64]){
     int i;
-    const int block_index[6]= {5,6,0,1,2,3};
+    const int block_index[6]= {5,4,0,1,2,3};
 
     a->dsp.clear_blocks(block[0]);
     
@@ -163,8 +163,6 @@ static int decode_frame(AVCodecContext *avctx,
     AVFrame * const p= (AVFrame*)&a->picture;
     int i;
 
-    *data_size = 0;
-
     /* special case for last picture */
     if (buf_size == 0) {
         return 0;
@@ -175,7 +173,7 @@ static int decode_frame(AVCodecContext *avctx,
 
     p->reference= 0;
     if(avctx->get_buffer(avctx, p) < 0){
-        fprintf(stderr, "get_buffer() failed\n");
+        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
     p->pict_type= I_TYPE;
@@ -197,7 +195,7 @@ static int decode_frame(AVCodecContext *avctx,
     a->qscale=  get_bits(&a->gb, 16);
     a->version= get_bits(&a->gb, 16);
     
-    printf("qscale:%d (0x%X), version:%d (0x%X)\n", a->qscale, a->qscale, a->version, a->version);
+//    printf("qscale:%d (0x%X), version:%d (0x%X)\n", a->qscale, a->qscale, a->version, a->version);
     
     for(a->mb_x=0; a->mb_x<a->mb_width; a->mb_x++){
         for(a->mb_y=0; a->mb_y<a->mb_height; a->mb_y++){
@@ -257,8 +255,6 @@ static int decode_end(AVCodecContext *avctx){
     av_freep(&a->picture.qscale_table);
     a->bitstream_buffer_size=0;
     
-    avcodec_default_free_buffers(avctx);
-
     return 0;
 }