virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
The variables which are declared in the teplate file are static and
therefore there is no symbol clash.
This commit is contained in:
Ronald S. Bultje 2012-07-21 16:42:36 -07:00
parent 3db407038e
commit b170b323e3
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ac3enc_fixed.c
View File

@ -35,7 +35,7 @@
#define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED #define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED
#include "ac3enc_opts_template.c" #include "ac3enc_opts_template.c"
static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name, 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"

6
libavcodec/ac3enc_opts_template.c
View File

@ -23,13 +23,7 @@
#include "internal.h" #include "internal.h"
#include "ac3.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 */ /* 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}, {"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 #if AC3ENC_TYPE != AC3ENC_TYPE_EAC3

2
libavcodec/eac3enc.c
View File

@ -33,7 +33,7 @@
#define AC3ENC_TYPE AC3ENC_TYPE_EAC3 #define AC3ENC_TYPE AC3ENC_TYPE_EAC3
#include "ac3enc_opts_template.c" #include "ac3enc_opts_template.c"
static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name, static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,
eac3_options, LIBAVUTIL_VERSION_INT }; ac3_options, LIBAVUTIL_VERSION_INT };
/** /**