summaryrefslogtreecommitdiff
path: root/libswscale/options.c
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2013-09-29 19:52:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-30 18:14:58 +0200
commit01e3340fb6022465ab23cf4a67a89c869b64476e (patch)
treecf7486a97b0fa3085d5327203d71562e7eeffdf7 /libswscale/options.c
parentfc0d8cf185921ed193566411699e0d6cf67c2096 (diff)
swscale: make bilinear scaling the default
Before this commit, sws_init_context() failed with an error if no scaler was explicitly set. Defaulting to something reasonable is better behavior. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/options.c')
-rw-r--r--libswscale/options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/options.c b/libswscale/options.c
index 8985e6b5d6..2b3147bb96 100644
--- a/libswscale/options.c
+++ b/libswscale/options.c
@@ -34,7 +34,7 @@ static const char *sws_context_to_name(void *ptr)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption swscale_options[] = {
- { "sws_flags", "scaler flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = DEFAULT }, 0, UINT_MAX, VE, "sws_flags" },
+ { "sws_flags", "scaler flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = SWS_BILINEAR }, 0, UINT_MAX, VE, "sws_flags" },
{ "fast_bilinear", "fast bilinear", 0, AV_OPT_TYPE_CONST, { .i64 = SWS_FAST_BILINEAR }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "bilinear", "bilinear", 0, AV_OPT_TYPE_CONST, { .i64 = SWS_BILINEAR }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "bicubic", "bicubic", 0, AV_OPT_TYPE_CONST, { .i64 = SWS_BICUBIC }, INT_MIN, INT_MAX, VE, "sws_flags" },