Move shared tables to aactab.c and add declarations to aactab.h. Also sync with

[ffmpeg] / libavcodec / liba52.c

diff --git a/libavcodec/liba52.c b/libavcodec/liba52.c
index c276494abf181969b46bff4d2688174743ebda27..ec0a252b5fe3839c7148bbda0325ca7b4f5f537a 100644 (file)
--- a/libavcodec/liba52.c
+++ b/libavcodec/liba52.c
@@ -119,6 +119,7 @@ static av_cold int a52_decode_init(AVCodecContext *avctx)
         avctx->channels = avctx->request_channels;
     }
 
+    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }
 
@@ -222,4 +223,5 @@ AVCodec liba52_decoder = {
     NULL,
     a52_decode_end,
     a52_decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("liba52 ATSC A/52 / AC-3"),
 };