RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-02 12:53:29 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/wavpackenc: use AV_OPT_TYPE_BOOL for all options

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-09-09 09:49:24 +00:00
parent 6603368ab4
commit 8bf2d3e468
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/wavpackenc.c
View File

@ -1829,9 +1829,9 @@ static int wv_stereo(WavPackEncodeContext *s,
log_limit = (((s->flags & MAG_MASK) >> MAG_LSB) + 4) * 256; log_limit = (((s->flags & MAG_MASK) >> MAG_LSB) + 4) * 256;
log_limit = FFMIN(6912, log_limit); log_limit = FFMIN(6912, log_limit);
if (s->joint) { if (s->joint != -1) {
force_js = s->joint > 0; force_js = s->joint;
force_ts = s->joint < 0; force_ts = !s->joint;
} }
if ((ret = allocate_buffers(s)) < 0) if ((ret = allocate_buffers(s)) < 0)
@ -2955,13 +2955,8 @@ static av_cold int wavpack_encode_close(AVCodecContext *avctx)
#define OFFSET(x) offsetof(WavPackEncodeContext, x) #define OFFSET(x) offsetof(WavPackEncodeContext, x)
#define FLAGS AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM #define FLAGS AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{ "joint_stereo", "", OFFSET(joint), AV_OPT_TYPE_INT, {.i64=0},-1, 1, FLAGS, "joint" }, { "joint_stereo", "", OFFSET(joint), AV_OPT_TYPE_BOOL, {.i64=-1}, -1, 1, FLAGS },
{ "on", "mid/side", 0, AV_OPT_TYPE_CONST, {.i64= 1}, 0, 0, FLAGS, "joint"}, { "optimize_mono", "", OFFSET(optimize_mono), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS },
{ "off", "left/right", 0, AV_OPT_TYPE_CONST, {.i64=-1}, 0, 0, FLAGS, "joint"},
{ "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64= 0}, 0, 0, FLAGS, "joint"},
{ "optimize_mono", "", OFFSET(optimize_mono), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "opt_mono" },
{ "on", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "opt_mono"},
{ "off", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "opt_mono"},
{ NULL }, { NULL },
}; };