| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-12-19 02:52:58 (GMT) |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2013-02-23 22:07:54 (GMT) |
| commit | 50f4337a2fd3b571b38c9475981e36405d1ca1e1 (patch) | |
| tree | 05444267320c28cd3ddcf78e21ee62271e86b0af | |
| parent | 5c7db097ebe1fb5c233cedd8846615074e7d6044 (diff) | |
| download | ffmpeg-50f4337a2fd3b571b38c9475981e36405d1ca1e1.zip ffmpeg-50f4337a2fd3b571b38c9475981e36405d1ca1e1.tar.gz ffmpeg-50f4337a2fd3b571b38c9475981e36405d1ca1e1.tar.bz2 | |
lavr: Add "resample_cutoff" option as a duplicate of "cutoff"
Avoids an option name conflict with libavcodec, which is needed in order
to work properly with avconv.
| -rw-r--r-- | libavresample/options.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavresample/options.c b/libavresample/options.c index 68548f0..ffa5190 100644 --- a/libavresample/options.c +++ b/libavresample/options.c @@ -54,6 +54,8 @@ static const AVOption options[] = { { "phase_shift", "Resampling Phase Shift", OFFSET(phase_shift), AV_OPT_TYPE_INT, { .i64 = 10 }, 0, 30, /* ??? */ PARAM }, { "linear_interp", "Use Linear Interpolation", OFFSET(linear_interp), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, PARAM }, { "cutoff", "Cutoff Frequency Ratio", OFFSET(cutoff), AV_OPT_TYPE_DOUBLE, { .dbl = 0.8 }, 0.0, 1.0, PARAM }, + /* duplicate option in order to work with avconv */ + { "resample_cutoff", "Cutoff Frequency Ratio", OFFSET(cutoff), AV_OPT_TYPE_DOUBLE, { .dbl = 0.8 }, 0.0, 1.0, PARAM }, { "matrix_encoding", "Matrixed Stereo Encoding", OFFSET(matrix_encoding), AV_OPT_TYPE_INT, {.i64 = AV_MATRIX_ENCODING_NONE}, AV_MATRIX_ENCODING_NONE, AV_MATRIX_ENCODING_NB-1, PARAM, "matrix_encoding" }, { "none", "None", 0, AV_OPT_TYPE_CONST, { .i64 = AV_MATRIX_ENCODING_NONE }, INT_MIN, INT_MAX, PARAM, "matrix_encoding" }, { "dolby", "Dolby", 0, AV_OPT_TYPE_CONST, { .i64 = AV_MATRIX_ENCODING_DOLBY }, INT_MIN, INT_MAX, PARAM, "matrix_encoding" }, |