diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-07-21 16:42:36 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-07-21 16:42:36 -0700 |
| commit | b170b323e3ea308bde5466859814af198bd45a2a (patch) | |
| tree | 131355e263bc1cc5d6715d4ed3a56474e9191243 /libavcodec | |
| parent | 3db407038e9b7e0da2537fc2e19c370c45dba355 (diff) | |
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.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ac3enc_fixed.c | 2 | ||||
| -rw-r--r-- | libavcodec/ac3enc_opts_template.c | 6 | ||||
| -rw-r--r-- | libavcodec/eac3enc.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index cc8f158c9d..09a011cbf7 100644 --- 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, - ac3fixed_options, LIBAVUTIL_VERSION_INT }; + ac3_options, LIBAVUTIL_VERSION_INT }; #include "ac3enc_template.c" diff --git a/libavcodec/ac3enc_opts_template.c b/libavcodec/ac3enc_opts_template.c index fa8984476e..1c67aa4164 100644 --- a/libavcodec/ac3enc_opts_template.c +++ b/libavcodec/ac3enc_opts_template.c @@ -23,13 +23,7 @@ #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[] = { -#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 diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 409d581eda..9aa5ea44b9 100644 --- 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, - eac3_options, LIBAVUTIL_VERSION_INT }; + ac3_options, LIBAVUTIL_VERSION_INT }; /** |