Buffer for get_bits must be padded because readers may overread.

[ffmpeg] / libavcodec / xl.c

diff --git a/libavcodec/xl.c b/libavcodec/xl.c
index 0f496017d9bcb227fed0f2d829b96b860ac48ece..67ad237e12fbbbbe75b94d641b68e97c01dfd406 100644 (file)
--- a/libavcodec/xl.c
+++ b/libavcodec/xl.c
@@ -2,27 +2,29 @@
  * Miro VideoXL codec
  * Copyright (c) 2004 Konstantin Shishkov
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
- 
+
 /**
  * @file xl.c
  * Miro VideoXL codec.
  */
- 
+
 #include "avcodec.h"
 #include "mpegvideo.h"
 
@@ -31,13 +33,13 @@ typedef struct VideoXLContext{
     AVFrame pic;
 } VideoXLContext;
 
-const int xl_table[32] = {
+static const int xl_table[32] = {
    0,   1,   2,   3,   4,   5,   6,   7,
    8,   9,  12,  15,  20,  25,  34,  46,
   64,  82,  94, 103, 108, 113, 116, 119,
  120, 121, 122, 123, 124, 125, 126, 127};
 
-static int decode_frame(AVCodecContext *avctx, 
+static int decode_frame(AVCodecContext *avctx,
                         void *data, int *data_size,
                         uint8_t *buf, int buf_size)
 {
@@ -48,12 +50,6 @@ static int decode_frame(AVCodecContext *avctx,
     int stride;
     uint32_t val;
     int y0, y1, y2, y3, c0, c1;
-        
-    
-    /* special case for last picture */
-    if (buf_size == 0) {
-        return 0;
-    }
 
     if(p->data[0])
         avctx->release_buffer(avctx, p);
@@ -69,18 +65,18 @@ static int decode_frame(AVCodecContext *avctx,
     Y = a->pic.data[0];
     U = a->pic.data[1];
     V = a->pic.data[2];
-    
+
     stride = avctx->width - 4;
     for (i = 0; i < avctx->height; i++) {
         /* lines are stored in reversed order */
         buf += stride;
-        
+
         for (j = 0; j < avctx->width; j += 4) {
             /* value is stored in LE dword with word swapped */
             val = LE_32(buf);
             buf -= 4;
             val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
-    
+
             if(!j)
                 y0 = (val & 0x1F) << 2;
             else
@@ -101,16 +97,16 @@ static int decode_frame(AVCodecContext *avctx,
                 c1 = (val & 0x1F) << 2;
             else
                 c1 += xl_table[val & 0x1F];
-            
+
             Y[j + 0] = y0 << 1;
             Y[j + 1] = y1 << 1;
             Y[j + 2] = y2 << 1;
             Y[j + 3] = y3 << 1;
-            
+
             U[j >> 2] = c0 << 1;
             V[j >> 2] = c1 << 1;
         }
-        
+
         buf += avctx->width + 4;
         Y += a->pic.linesize[0];
         U += a->pic.linesize[1];
@@ -119,7 +115,7 @@ static int decode_frame(AVCodecContext *avctx,
 
     *data_size = sizeof(AVFrame);
     *(AVFrame*)data = a->pic;
-    
+
     return buf_size;
 }