avformat/http: Remove deprecated "user-agent" option

[ffmpeg] / libavcodec / ac3enc_float.c

diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
index 74f3ab8d8627c3647cf5d1f51d2a48c7959df9da..223874907fe10403d9fe25aa8e11331bd49b97b8 100644 (file)
--- a/libavcodec/ac3enc_float.c
+++ b/libavcodec/ac3enc_float.c
@@ -34,12 +34,10 @@
 #include "kbdwin.h"
 
 
-#define AC3ENC_TYPE AC3ENC_TYPE_AC3
-#include "ac3enc_opts_template.c"
 static const AVClass ac3enc_class = {
     .class_name = "AC-3 Encoder",
     .item_name  = av_default_item_name,
-    .option     = ac3_options,
+    .option     = ff_ac3_enc_options,
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
@@ -147,6 +145,6 @@ AVCodec ff_ac3_encoder = {
     .priv_class      = &ac3enc_class,
     .supported_samplerates = ff_ac3_sample_rate_tab,
     .channel_layouts = ff_ac3_channel_layouts,
-    .defaults        = ac3_defaults,
+    .defaults        = ff_ac3_enc_defaults,
     .caps_internal   = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
 };