ac3: detect dba errors and prevent writing past end of array

[ffmpeg] / libavcodec / cljr.c

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 44810f5cff53f3867ad18df4c1d022f15a8e33ac..c80af01f0d8f8cca9f1ccbdd977077a6ea73913a 100644 (file)
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
@@ -26,7 +25,11 @@
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
+#include "bitstream.h"
+
+/* Disable the encoder. */
+#undef CONFIG_CLJR_ENCODER
 
 typedef struct CLJRContext{
     AVCodecContext *avctx;
@@ -38,7 +41,7 @@ typedef struct CLJRContext{
 
 static int decode_frame(AVCodecContext *avctx,
                         void *data, int *data_size,
-                        uint8_t *buf, int buf_size)
+                        const uint8_t *buf, int buf_size)
 {
     CLJRContext * const a = avctx->priv_data;
     AVFrame *picture = data;
@@ -53,7 +56,7 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     init_get_bits(&a->gb, buf, buf_size);
@@ -81,7 +84,7 @@ static int decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-#if 0
+#ifdef CONFIG_CLJR_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     CLJRContext * const a = avctx->priv_data;
     AVFrame *pict = data;
@@ -90,7 +93,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     int mb_x, mb_y;
 
     *p = *pict;
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     emms_c();
@@ -105,14 +108,14 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
 }
 #endif
 
-static void common_init(AVCodecContext *avctx){
+static av_cold void common_init(AVCodecContext *avctx){
     CLJRContext * const a = avctx->priv_data;
 
     avctx->coded_frame= (AVFrame*)&a->picture;
     a->avctx= avctx;
 }
 
-static int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
 
     common_init(avctx);
 
@@ -121,8 +124,8 @@ static int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0
-static int encode_init(AVCodecContext *avctx){
+#ifdef CONFIG_CLJR_ENCODER
+static av_cold int encode_init(AVCodecContext *avctx){
 
     common_init(avctx);
 
@@ -140,10 +143,10 @@ AVCodec cljr_decoder = {
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
-#if 0
-#ifdef CONFIG_ENCODERS
 
+#ifdef CONFIG_CLJR_ENCODER
 AVCodec cljr_encoder = {
     "cljr",
     CODEC_TYPE_VIDEO,
@@ -152,7 +155,6 @@ AVCodec cljr_encoder = {
     encode_init,
     encode_frame,
     //encode_end,
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
-
-#endif //CONFIG_ENCODERS
 #endif