aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Thompson <dev@aaront.org>2024-05-16 06:10:36 +0000
committerJames Zern <jzern@google.com>2024-05-17 15:40:31 -0700
commitbe3404bbacae5a046e1b3e66a98810b4b7564249 (patch)
tree1577ab2e0a84838bed244239ac6fa75671ce9591
parent727a603158b466a3f11f419012856e845a0721b9 (diff)
downloadffmpeg-be3404bbacae5a046e1b3e66a98810b4b7564249.tar.gz
lavc/libvpxenc: Fix parsing of ts_layering_mode parameter
The value was being parsed as base 4, so the value "4" was invalid and would result in ts_layering_mode being set to 0. Signed-off-by: Aaron Thompson <dev@aaront.org> Signed-off-by: James Zern <jzern@google.com>
-rw-r--r--libavcodec/libvpxenc.c2
-rw-r--r--libavcodec/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index bcbdc4981e..5c7b6e9de7 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -684,7 +684,7 @@ static int vpx_ts_param_parse(VPxContext *ctx, struct vpx_codec_enc_cfg *enccfg,
vp8_ts_parse_int_array(enccfg->ts_layer_id, value, value_len, VPX_TS_MAX_PERIODICITY);
} else if (!strcmp(key, "ts_layering_mode")) {
/* option for pre-defined temporal structures in function set_temporal_layer_pattern. */
- ts_layering_mode = strtoul(value, &value, 4);
+ ts_layering_mode = strtoul(value, &value, 10);
}
#if (VPX_ENCODER_ABI_VERSION >= 12) && CONFIG_LIBVPX_VP9_ENCODER
diff --git a/libavcodec/version.h b/libavcodec/version.h
index f0958eee14..3d2de546b3 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 5
-#define LIBAVCODEC_VERSION_MICRO 103
+#define LIBAVCODEC_VERSION_MICRO 104
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \