Use AV_GCC_VERSION_AT_LEAST() to simplify gcc version checks.

[ffmpeg] / libavcodec / ws-snd1.c

diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c
index 3624909a30f694612d5449db6d6c1403f9d71c14..24753b0c9ce9361f01c362f1dabe02b77978e572 100644 (file)
--- a/libavcodec/ws-snd1.c
+++ b/libavcodec/ws-snd1.c
@@ -36,16 +36,17 @@ static const char ws_adpcm_4bit[] = {
 
 #define CLIP8(a) if(a>127)a=127;if(a<-128)a=-128;
 
-static int ws_snd_decode_init(AVCodecContext * avctx)
+static av_cold int ws_snd_decode_init(AVCodecContext * avctx)
 {
 //    WSSNDContext *c = avctx->priv_data;
 
+    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }
 
 static int ws_snd_decode_frame(AVCodecContext *avctx,
                 void *data, int *data_size,
-                uint8_t *buf, int buf_size)
+                const uint8_t *buf, int buf_size)
 {
 //    WSSNDContext *c = avctx->priv_data;
 
@@ -62,6 +63,14 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
     in_size = AV_RL16(&buf[2]);
     buf += 4;
 
+    if (out_size > *data_size) {
+        av_log(avctx, AV_LOG_ERROR, "Frame is too large to fit in buffer\n");
+        return -1;
+    }
+    if (in_size > buf_size) {
+        av_log(avctx, AV_LOG_ERROR, "Frame data is larger than input buffer\n");
+        return -1;
+    }
     if (in_size == out_size) {
         for (i = 0; i < out_size; i++)
             *samples++ = (*buf++ - 0x80) << 8;
@@ -141,4 +150,5 @@ AVCodec ws_snd1_decoder = {
     NULL,
     NULL,
     ws_snd_decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
 };