@@ -1103,12 +1103,14 @@ flac_decoder_select="golomb"

 flac_encoder_select="golomb lpc"

 flashsv_decoder_select="zlib"

 flashsv_encoder_select="zlib"

+flv_decoder_select="h263_decoder"

 flv_encoder_select="h263_encoder"

 h261_encoder_select="aandct"

 h263_decoder_select="h263_parser"

 h263_encoder_select="aandct"

 h263_vaapi_hwaccel_deps="va_va_h"

 h263_vaapi_hwaccel_select="vaapi h263_decoder"

+h263i_decoder_select="h263_decoder"

 h263p_encoder_select="h263_encoder"

 h264_decoder_select="golomb"

 h264_vaapi_hwaccel_deps="va_va_h"

@@ -1123,6 +1125,7 @@ loco_decoder_select="golomb"

 mjpeg_encoder_select="aandct"

 mpeg1video_encoder_select="aandct"

 mpeg2video_encoder_select="aandct"

+mpeg4_decoder_select="h263_decoder mpeg4video_parser"

 mpeg4_encoder_select="h263_encoder"

 mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"

 mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"

@@ -1136,8 +1139,11 @@ mpeg4_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"

 mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"

 mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"

 mpeg_xvmc_decoder_select="mpegvideo_decoder"

+msmpeg4v1_decoder_select="h263_decoder"

 msmpeg4v1_encoder_select="h263_encoder"

+msmpeg4v2_decoder_select="h263_decoder"

 msmpeg4v2_encoder_select="h263_encoder"

+msmpeg4v3_decoder_select="h263_decoder"

 msmpeg4v3_encoder_select="h263_encoder"

 nellymoser_decoder_select="fft mdct"

 nellymoser_encoder_select="fft mdct"

@@ -116,8 +116,6 @@ OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o

 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_FOURXM_DECODER)          += 4xm.o

 OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o huffman.o

 OBJS-$(CONFIG_FRWU_DECODER)            += frwu.o

@@ -132,8 +130,6 @@ OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261.o             \

 OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o \

                                           mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_H263_VAAPI_HWACCEL)      += vaapi_mpeg4.o

-OBJS-$(CONFIG_H263I_DECODER)           += h263dec.o h263.o \

-                                          mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o      \

                                           ratecontrol.o h263.o mpeg12data.o \

                                           mpegvideo.o error_resilience.o

@@ -206,17 +202,12 @@ OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpegvideo_enc.o \

                                           motion_est.o ratecontrol.o  \

                                           mpeg12.o mpeg12data.o       \

                                           mpegvideo.o error_resilience.o

-OBJS-$(CONFIG_MPEG4_DECODER)           += h263dec.o h263.o mpeg4video_parser.o \

-                                          mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL)     += vaapi_mpeg4.o

-OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o \

-                                          h263.o mpegvideo.o error_resilience.o

+OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4.o msmpeg4data.o

 OBJS-$(CONFIG_MSMPEG4V1_ENCODER)       += msmpeg4.o msmpeg4data.o

-OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o \

-                                          h263.o mpegvideo.o error_resilience.o

+OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4.o msmpeg4data.o

 OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4.o msmpeg4data.o

-OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4.o msmpeg4data.o h263dec.o \

-                                          h263.o mpegvideo.o error_resilience.o

+OBJS-$(CONFIG_MSMPEG4V3_DECODER)       += msmpeg4.o msmpeg4data.o

 OBJS-$(CONFIG_MSMPEG4V3_ENCODER)       += msmpeg4.o msmpeg4data.o

 OBJS-$(CONFIG_MSRLE_DECODER)           += msrle.o msrledec.o

 OBJS-$(CONFIG_MSVIDEO1_DECODER)        += msvideo1.o