libavcodec/decode: avoid UB when getting plane sizes

[ffmpeg] / libavcodec / libaomdec.c

diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c
index ddfba8a0233e0fd958739a8c490a4b4e72347926..a72ac984e72a9f7ea24227d79c1d9ce9f66e975c 100644 (file)
--- a/libavcodec/libaomdec.c
+++ b/libavcodec/libaomdec.c
@@ -42,8 +42,7 @@ static av_cold int aom_init(AVCodecContext *avctx,
 {
     AV1DecodeContext *ctx           = avctx->priv_data;
     struct aom_codec_dec_cfg deccfg = {
-        /* token partitions+1 would be a decent choice */
-        .threads = FFMIN(avctx->thread_count, 16)
+        .threads = FFMIN(avctx->thread_count ? avctx->thread_count : av_cpu_count(), 16)
     };
 
     av_log(avctx, AV_LOG_INFO, "%s\n", aom_codec_version_str());
@@ -232,5 +231,4 @@ AVCodec ff_libaom_av1_decoder = {
     .capabilities   = AV_CODEC_CAP_AUTO_THREADS | AV_CODEC_CAP_DR1,
     .profiles       = NULL_IF_CONFIG_SMALL(ff_av1_profiles),
     .wrapper_name   = "libaom",
-    .bsfs           = "dump_extra",
 };