diff --git a/configure b/configure
index b101c12b34bbe958edb66e05b425487feba32953..af9881e5ecfd36b6f6f7007e45dcdfa70d67173c 100755
--- a/configure
+++ b/configure
@@ -1068,7 +1068,7 @@ flac_decoder_select="golomb"
 flac_encoder_select="golomb"
 flashsv_decoder_select="zlib"
 flashsv_encoder_select="zlib"
-flv_encoder_select="aandct"
+flv_encoder_select="h263_encoder"
 h261_encoder_select="aandct"
 h263_encoder_select="aandct"
 h263_vaapi_hwaccel_deps="va_va_h"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 027c1ed20094e8468929df5c0ab16e7bcd403308..6ab4fd8c21b7238d4cffa557daa87d543ad2160c 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -95,7 +95,6 @@ OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
 OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.o
 OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
 OBJS-$(CONFIG_FLV_DECODER)             += h263dec.o h263.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_FLV_ENCODER)             += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
 OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o huffman.o
 OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o