aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libaomenc.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2019-03-29 14:55:00 -0300
committerJames Almer <jamrial@gmail.com>2019-03-29 14:55:00 -0300
commit0856c5da0716e9c461d4f73339a2c2390d0a1162 (patch)
treea13b86358041857f5c3c010ecc7bd3d2e3bd0679 /libavcodec/libaomenc.c
parent995889abbf31389aa0f002ea6599c7c89526d1d6 (diff)
downloadffmpeg-0856c5da0716e9c461d4f73339a2c2390d0a1162.tar.gz
avcodec/libaomenc: fix default value for row-mt option
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libaomenc.c')
-rw-r--r--libavcodec/libaomenc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index a2d230399f..a0fceddea5 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -728,7 +728,8 @@ static av_cold int aom_init(AVCodecContext *avctx,
}
#endif
#ifdef AOM_CTRL_AV1E_SET_ROW_MT
- codecctl_int(avctx, AV1E_SET_ROW_MT, ctx->row_mt);
+ if (ctx->row_mt >= 0)
+ codecctl_int(avctx, AV1E_SET_ROW_MT, ctx->row_mt);
#endif
#ifdef AOM_CTRL_AV1E_SET_ENABLE_INTRABC
if (ctx->enable_intrabc >= 0)
@@ -1082,7 +1083,7 @@ static const AVOption options[] = {
{ "tiles", "Tile columns x rows", OFFSET(tile_cols), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, VE },
{ "tile-columns", "Log2 of number of tile columns to use", OFFSET(tile_cols_log2), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, VE},
{ "tile-rows", "Log2 of number of tile rows to use", OFFSET(tile_rows_log2), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, VE},
- { "row-mt", "Enable row based multi-threading", OFFSET(row_mt), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, VE},
+ { "row-mt", "Enable row based multi-threading", OFFSET(row_mt), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
{ "enable-cdef", "Enable CDEF filtering", OFFSET(enable_cdef), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
{ "enable-global-motion", "Enable global motion", OFFSET(enable_global_motion), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE},
{ "enable-intrabc", "Enable intra block copy prediction mode", OFFSET(enable_intrabc), AV_OPT_TYPE_BOOL, {.i64 = -1}, 0, 1, VE},