Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-07-22 03:42:36 +0400
committerRonald S. Bultje <rsbultje@gmail.com>2012-07-22 03:42:36 +0400
commitb170b323e3ea308bde5466859814af198bd45a2a (patch)
tree131355e263bc1cc5d6715d4ed3a56474e9191243 /libavcodec/ac3enc_opts_template.c
parent3db407038e9b7e0da2537fc2e19c370c45dba355 (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/ac3enc_opts_template.c')
-rw-r--r--libavcodec/ac3enc_opts_template.c6
1 files changed, 0 insertions, 6 deletions
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