diff --git a/libavcodec/cbrt_tablegen.c b/libavcodec/cbrt_tablegen.c
index babb85a07b..e0a8e63a8b 100644
--- a/libavcodec/cbrt_tablegen.c
+++ b/libavcodec/cbrt_tablegen.c
@@ -21,7 +21,6 @@
  */
 
 #include <stdlib.h>
-#include "libavutil/libm.h"
 #define CONFIG_HARDCODED_TABLES 0
 #include "cbrt_tablegen.h"
 #include "tableprint.h"
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 36df84f741..2874e3797c 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -36,6 +36,7 @@ typedef struct AACContext {
     int signaling;
     int latm;
     int header_period;
+    int vbr;
 
     AudioFrameQueue afq;
 } AACContext;
@@ -50,6 +51,7 @@ static const AVOption aac_enc_options[] = {
     { "explicit_hierarchical", "Explicit hierarchical signaling", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, "signaling" },
     { "latm", "Output LATM/LOAS encapsulated data", offsetof(AACContext, latm), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
     { "header_period", "StreamMuxConfig and PCE repetition period (in frames)", offsetof(AACContext, header_period), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0xffff, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
+    { "vbr", "VBR mode (1-5)", offsetof(AACContext, vbr), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 5, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
     { NULL }
 };
 
@@ -173,13 +175,16 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
         goto error;
     }
 
-    if (avctx->flags & CODEC_FLAG_QSCALE) {
-        int mode = avctx->global_quality;
+    if (avctx->flags & CODEC_FLAG_QSCALE || s->vbr) {
+        int mode = s->vbr ? s->vbr : avctx->global_quality;
         if (mode <  1 || mode > 5) {
             av_log(avctx, AV_LOG_WARNING,
                    "VBR quality %d out of range, should be 1-5\n", mode);
             mode = av_clip(mode, 1, 5);
         }
+        av_log(avctx, AV_LOG_WARNING,
+               "Note, the VBR setting is unsupported and only works with "
+               "some parameter combinations\n");
         if ((err = aacEncoder_SetParam(s->handle, AACENC_BITRATEMODE,
                                        mode)) != AACENC_OK) {
             av_log(avctx, AV_LOG_ERROR, "Unable to set the VBR bitrate mode %d: %s\n",
diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index 903cf1290b..bef48384bd 100644
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -87,7 +87,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     bytestream_get_le16(&buf);
     // The following value is supposed to indicate the start offset
     // (relative to the palette) of the data for the second field,
-    // however there are files  where it has a bogus value and thus
+    // however there are files in which it has a bogus value and thus
     // we just ignore it
     bytestream_get_le16(&buf);