ac3: don't use different names for option tables in the template file.

The variables which are declared in the teplate file are static and
therefore there is no symbol clash.

diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c
index cc8f158..09a011c 100644 (file)
--- a/libavcodec/ac3enc_fixed.c
+++ b/libavcodec/ac3enc_fixed.c
@@ -35,7 +35,7 @@
 #define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED
 #include "ac3enc_opts_template.c"
 static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
 #define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED
 #include "ac3enc_opts_template.c"
 static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,

-                                      ac3fixed_options, LIBAVUTIL_VERSION_INT };
+                                      ac3_options, LIBAVUTIL_VERSION_INT };

 
 #include "ac3enc_template.c"
 
 
 #include "ac3enc_template.c"
 

diff --git a/libavcodec/ac3enc_opts_template.c b/libavcodec/ac3enc_opts_template.c
index fa89844..1c67aa4 100644 (file)
--- a/libavcodec/ac3enc_opts_template.c
+++ b/libavcodec/ac3enc_opts_template.c
@@ -23,13 +23,7 @@
 #include "internal.h"
 #include "ac3.h"
 
 #include "internal.h"
 #include "ac3.h"
 

-#if AC3ENC_TYPE == AC3ENC_TYPE_AC3_FIXED
-static const AVOption ac3fixed_options[] = {
-#elif AC3ENC_TYPE == AC3ENC_TYPE_AC3

 static const AVOption ac3_options[] = {
 static const AVOption ac3_options[] = {

-#else /* AC3ENC_TYPE_EAC3 */
-static const AVOption eac3_options[] = {
-#endif

 /* Metadata Options */
 {"per_frame_metadata", "Allow Changing Metadata Per-Frame", OFFSET(allow_per_frame_metadata), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, 1, AC3ENC_PARAM},
 #if AC3ENC_TYPE != AC3ENC_TYPE_EAC3
 /* Metadata Options */
 {"per_frame_metadata", "Allow Changing Metadata Per-Frame", OFFSET(allow_per_frame_metadata), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, 1, AC3ENC_PARAM},
 #if AC3ENC_TYPE != AC3ENC_TYPE_EAC3

diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c
index 409d581..9aa5ea4 100644 (file)
--- a/libavcodec/eac3enc.c
+++ b/libavcodec/eac3enc.c
@@ -33,7 +33,7 @@
 #define AC3ENC_TYPE AC3ENC_TYPE_EAC3
 #include "ac3enc_opts_template.c"
 static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,
 #define AC3ENC_TYPE AC3ENC_TYPE_EAC3
 #include "ac3enc_opts_template.c"
 static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,

-                                       eac3_options, LIBAVUTIL_VERSION_INT };
+                                       ac3_options, LIBAVUTIL_VERSION_INT };

 
 
 /**
 
 
 /**