diff --git a/configure b/configure
index df42f37d08..edd257052e 100755
--- a/configure
+++ b/configure
@@ -2847,6 +2847,7 @@ sonic_encoder_select="golomb rangecoder"
 sonic_ls_encoder_select="golomb rangecoder"
 sp5x_decoder_select="mjpeg_decoder"
 speedhq_decoder_select="mpegvideo"
+speedhq_encoder_select="mpegvideoenc"
 srgc_decoder_deps="zlib"
 svq1_decoder_select="hpeldsp"
 svq1_encoder_select="hpeldsp me_cmp mpegvideoenc"
diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c
index 0c08894315..221a70b3e9 100644
--- a/libavcodec/speedhq.c
+++ b/libavcodec/speedhq.c
@@ -26,6 +26,7 @@
 
 #define BITSTREAM_READER_LE
 
+#include "config.h"
 #include "libavutil/attributes.h"
 
 #include "avcodec.h"
@@ -140,6 +141,7 @@ RLTable ff_rl_speedhq = {
     speedhq_level,
 };
 
+#if CONFIG_SPEEDHQ_DECODER
 /* NOTE: The first element is always 16, unscaled. */
 static const uint8_t unscaled_quant_matrix[64] = {
     16, 16, 19, 22, 26, 27, 29, 34,
@@ -656,3 +658,4 @@ AVCodec ff_speedhq_decoder = {
     .decode         = speedhq_decode_frame,
     .capabilities   = AV_CODEC_CAP_DR1,
 };
+#endif /* CONFIG_SPEEDHQ_DECODER */