X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2F8svx.c;h=a9d16acea371b458f406cff1c1682b036c6e8002;hb=e1f7cb7fa0aec465ec0c172d1b922aebced04cc2;hp=f3dbdd0e4245f79786e46d5228c5cbdd08702508;hpb=1b41f2604536063b23d65efbc08f3728c1aa39d6;p=ffmpeg

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index f3dbdd0e424..a9d16acea37 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -1,5 +1,5 @@
 /*
- * 8SVX Audio Decoder
+ * 8SVX audio decoder
  * Copyright (C) 2008 Jaikrishnan Menon
  *
  * This file is part of FFmpeg.
@@ -32,12 +32,12 @@
 /** decoder context */
 typedef struct EightSvxContext {
     int16_t fib_acc;
-    int16_t *table;
+    const int16_t *table;
 } EightSvxContext;
 
-const static int16_t fibonacci[16]   = { -34<<8, -21<<8, -13<<8,  -8<<8, -5<<8, -3<<8, -2<<8, -1<<8,
+static const int16_t fibonacci[16]   = { -34<<8, -21<<8, -13<<8,  -8<<8, -5<<8, -3<<8, -2<<8, -1<<8,
                                           0, 1<<8, 2<<8, 3<<8, 5<<8, 8<<8, 13<<8, 21<<8 };
-const static int16_t exponential[16] = { -128<<8, -64<<8, -32<<8, -16<<8, -8<<8, -4<<8, -2<<8, -1<<8,
+static const int16_t exponential[16] = { -128<<8, -64<<8, -32<<8, -16<<8, -8<<8, -4<<8, -2<<8, -1<<8,
                                           0, 1<<8, 2<<8, 4<<8, 8<<8, 16<<8, 32<<8, 64<<8 };
 
 /** decode a frame */
@@ -86,23 +86,26 @@ static av_cold int eightsvx_decode_init(AVCodecContext *avctx)
         default:
           return -1;
     }
+    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }
 
 AVCodec eightsvx_fib_decoder = {
-  .name           = "8svx fibonacci decoder",
+  .name           = "8svx_fib",
   .type           = CODEC_TYPE_AUDIO,
   .id             = CODEC_ID_8SVX_FIB,
   .priv_data_size = sizeof (EightSvxContext),
   .init           = eightsvx_decode_init,
   .decode         = eightsvx_decode_frame,
+  .long_name      = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
 };
 
 AVCodec eightsvx_exp_decoder = {
-  .name           = "8svx exponential decoder",
+  .name           = "8svx_exp",
   .type           = CODEC_TYPE_AUDIO,
   .id             = CODEC_ID_8SVX_EXP,
   .priv_data_size = sizeof (EightSvxContext),
   .init           = eightsvx_decode_init,
   .decode         = eightsvx_decode_frame,
+  .long_name      = NULL_IF_CONFIG_SMALL("8SVX exponential"),
 };