summaryrefslogtreecommitdiff
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-11 14:07:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-11 14:10:22 +0200
commit44239bd9f2f1867f9dc732c686f91edd86d33fbc (patch)
tree1c6937dc60236fc634d0cab9a03eecbff495329b /libswresample
parent6c704d9c30425c9a2c8bb1d1787b62643a3439f4 (diff)
swr: add a swr_flags AVOption
Using swr_flags instead of plain flags will avoid conflicts that arise with plain flags and multiple libs (which all have AVOption flags) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/swresample.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 089d3e83d1..823dbda884 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -52,6 +52,7 @@ static const AVOption options[]={
{"slev", "sourround mix level" , OFFSET(slev) , AV_OPT_TYPE_FLOAT, {.dbl=C_30DB}, 0, 4, 0},
{"rmvol", "rematrix volume" , OFFSET(rematrix_volume), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, -1000, 1000, 0},
{"flags", NULL , OFFSET(flags) , AV_OPT_TYPE_FLAGS, {.dbl=0}, 0, UINT_MAX, 0, "flags"},
+{"swr_flags", NULL , OFFSET(flags) , AV_OPT_TYPE_FLAGS, {.dbl=0}, 0, UINT_MAX, 0, "flags"},
{"res", "force resampling", 0, AV_OPT_TYPE_CONST, {.dbl=SWR_FLAG_RESAMPLE}, INT_MIN, INT_MAX, 0, "flags"},
{"dither_scale" , "dither scale" , OFFSET(dither_scale ), AV_OPT_TYPE_FLOAT, {.dbl=1}, 0, INT_MAX, 0},
{"dither_method", "dither method" , OFFSET(dither_method), AV_OPT_TYPE_INT , {.dbl=0}, 0, SWR_DITHER_NB-1, 0, "dither_method"},