Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 9 May 2016 14:52:05 +0000 (15:52 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 9 May 2016 15:25:28 +0000 (16:25 +0100)
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
  build: miscellaneous cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
15 files changed:
1  2 
Makefile
libavcodec/Makefile
libavcodec/aarch64/Makefile
libavcodec/arm/Makefile
libavcodec/ppc/Makefile
libavdevice/Makefile
libavfilter/Makefile
libavformat/Makefile
libavutil/Makefile
libswscale/Makefile
tests/Makefile
tests/checkasm/Makefile
tests/fate/image.mak
tests/fate/libavresample.mak
tests/fate/seek.mak

diff --cc Makefile
+++ b/Makefile
@@@ -2,47 -1,96 +2,47 @@@ MAIN_MAKEFILE=
  include config.mak
  
  vpath %.c    $(SRC_PATH)
 -vpath %.m    $(SRC_PATH)
 +vpath %.cpp  $(SRC_PATH)
  vpath %.h    $(SRC_PATH)
 +vpath %.inc  $(SRC_PATH)
 +vpath %.m    $(SRC_PATH)
  vpath %.S    $(SRC_PATH)
  vpath %.asm  $(SRC_PATH)
 +vpath %.rc   $(SRC_PATH)
  vpath %.v    $(SRC_PATH)
  vpath %.texi $(SRC_PATH)
 +vpath %/fate_config.sh.template $(SRC_PATH)
  
 -ifndef V
 -Q      = @
 -ECHO   = printf "$(1)\t%s\n" $(2)
 -BRIEF  = CC HOSTCC HOSTLD AS YASM AR LD
 -SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM STRIP
 -MSG    = $@
 -M      = @$(call ECHO,$(TAG),$@);
 -$(foreach VAR,$(BRIEF), \
 -    $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
 -$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
 -$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_PATH)/%=%)); $(INSTALL))
 -endif
 -
 -ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil swscale
 -
 -IFLAGS     := -I. -I$(SRC_PATH)
 -CPPFLAGS   := $(IFLAGS) $(CPPFLAGS)
 -CFLAGS     += $(ECFLAGS)
 -CCFLAGS     = $(CPPFLAGS) $(CFLAGS)
 -OBJCFLAGS  += $(EOBJCFLAGS)
 -OBJCCFLAGS  = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
 -ASFLAGS    := $(CPPFLAGS) $(ASFLAGS)
 -YASMFLAGS  += $(IFLAGS:%=%/) -Pconfig.asm
 -HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
 -LDFLAGS    := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
 -
 -define COMPILE
 -      $(call $(1)DEP,$(1))
 -      $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $<
 -endef
 -
 -COMPILE_C = $(call COMPILE,CC)
 -COMPILE_S = $(call COMPILE,AS)
 -COMPILE_M = $(call COMPILE,OBJCC)
 -COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 -
 -%.o: %.c
 -      $(COMPILE_C)
 -
 -%.o: %.S
 -      $(COMPILE_S)
 -
 -%.o: %.m
 -      $(COMPILE_M)
 -
 -%_host.o: %.c
 -      $(COMPILE_HOSTC)
 +AVPROGS-$(CONFIG_FFMPEG)   += ffmpeg
 +AVPROGS-$(CONFIG_FFPLAY)   += ffplay
 +AVPROGS-$(CONFIG_FFPROBE)  += ffprobe
 +AVPROGS-$(CONFIG_FFSERVER) += ffserver
  
 -%.i: %.c
 -      $(CC) $(CCFLAGS) $(CC_E) $<
 -
 -%.h.c:
 -      $(Q)echo '#include "$*.h"' >$@
 -
 -%.ver: %.v
 -      $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ | sed -e 's/:/:\
 -/' -e 's/; /;\
 -/g' > $@
 -
 -%.c %.h: TAG = GEN
 -
 -AVPROGS-$(CONFIG_AVCONV)   += avconv
 -AVPROGS-$(CONFIG_AVPLAY)   += avplay
 -AVPROGS-$(CONFIG_AVPROBE)  += avprobe
 -
 -AVPROGS    := $(AVPROGS-yes:%=%$(EXESUF))
 +AVPROGS    := $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
 +INSTPROGS   = $(AVPROGS-yes:%=%$(PROGSSUF)$(EXESUF))
  PROGS      += $(AVPROGS)
  
 -AVBASENAMES = avconv avplay avprobe
 -ALLAVPROGS  = $(AVBASENAMES:%=%$(EXESUF))
 +AVBASENAMES  = ffmpeg ffplay ffprobe ffserver
 +ALLAVPROGS   = $(AVBASENAMES:%=%$(PROGSSUF)$(EXESUF))
 +ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
  
  $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
- OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o
- OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o
- ifndef CONFIG_VIDEOTOOLBOX
- OBJS-ffmpeg-$(CONFIG_VDA)     += ffmpeg_videotoolbox.o
- endif
 +$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_opencl.o))
 +
 +OBJS-ffmpeg                   += ffmpeg_opt.o ffmpeg_filter.o
 +OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o
 +OBJS-ffmpeg-$(CONFIG_LIBMFX)  += ffmpeg_qsv.o
 +OBJS-ffmpeg-$(CONFIG_VAAPI)   += ffmpeg_vaapi.o
++ifndef CONFIG_VIDEOTOOLBOX
++OBJS-ffmpeg-$(CONFIG_VDA)     += ffmpeg_videotoolbox.o
++endif
++OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o
++OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o
 +OBJS-ffserver                 += ffserver_config.o
  
 -OBJS-avconv                   += avconv_opt.o avconv_filter.o
 -OBJS-avconv-$(CONFIG_LIBMFX)  += avconv_qsv.o
 -OBJS-avconv-$(CONFIG_VAAPI)   += avconv_vaapi.o
 -OBJS-avconv-$(CONFIG_VDA)     += avconv_vda.o
 -OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
 -OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
 -
 -TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
 +TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch
  HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
 -TOOLS       = qt-faststart trasher
 +TOOLS       = qt-faststart trasher uncoded_frame
  TOOLS-$(CONFIG_ZLIB) += cws2fws
  
  # $(FFLIBS-yes) needs to be in linking order
@@@ -57,10 -103,10 +57,11 @@@ FFLIBS-$(CONFIG_SWSCALE)    += swscal
  
  FFLIBS := avutil
  
 -DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
 +DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd
 +EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/Makefile $(SRC_PATH)/doc/examples/README
  
- SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
+ SKIPHEADERS = cmdutils_common_opts.h                                    \
+               compat/w32pthreads.h
  
  include $(SRC_PATH)/common.mak
  
@@@ -3,13 -1,11 +3,13 @@@ include $(SUBDIR)../config.ma
  NAME = avcodec
  
  HEADERS = avcodec.h                                                     \
 +          avdct.h                                                       \
            avfft.h                                                       \
-           dv_profile.h                                                  \
            d3d11va.h                                                     \
            dirac.h                                                       \
+           dv_profile.h                                                  \
            dxva2.h                                                       \
 +          jni.h                                                         \
            qsv.h                                                         \
            vaapi.h                                                       \
            vda.h                                                         \
@@@ -225,19 -179,15 +225,19 @@@ OBJS-$(CONFIG_CINEPAK_ENCODER)         
  OBJS-$(CONFIG_CLJR_DECODER)            += cljrdec.o
  OBJS-$(CONFIG_CLJR_ENCODER)            += cljrenc.o
  OBJS-$(CONFIG_CLLC_DECODER)            += cllc.o canopus.o
- OBJS-$(CONFIG_COOK_DECODER)            += cook.o
  OBJS-$(CONFIG_COMFORTNOISE_DECODER)    += cngdec.o celp_filters.o
  OBJS-$(CONFIG_COMFORTNOISE_ENCODER)    += cngenc.o
+ OBJS-$(CONFIG_COOK_DECODER)            += cook.o
 +OBJS-$(CONFIG_CPIA_DECODER)            += cpia.o
  OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
  OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
 -OBJS-$(CONFIG_DCA_DECODER)             += dcadec.o dca.o dcadsp.o      \
 -                                          dcadata.o dca_exss.o         \
 -                                          dca_xll.o synth_filter.o
 +OBJS-$(CONFIG_DCA_DECODER)             += dcadec.o dca.o dcadata.o dcahuff.o \
 +                                          dca_core.o dca_exss.o dca_xll.o \
 +                                          dcadsp.o dcadct.o synth_filter.o
 +OBJS-$(CONFIG_DCA_ENCODER)             += dcaenc.o dca.o dcadata.o
  OBJS-$(CONFIG_DDS_DECODER)             += dds.o
 +OBJS-$(CONFIG_DIRAC_DECODER)           += diracdec.o dirac.o diracdsp.o diractab.o \
 +                                          dirac_arith.o mpeg12data.o dirac_dwt.o
  OBJS-$(CONFIG_DFA_DECODER)             += dfa.o
  OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
  OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o
@@@ -389,16 -322,15 +389,17 @@@ OBJS-$(CONFIG_MP3ON4_DECODER)          
  OBJS-$(CONFIG_MP3ON4FLOAT_DECODER)     += mpegaudiodec_float.o mpeg4audio.o
  OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.o mpc.o
  OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o
 -OBJS-$(CONFIG_MPEG_XVMC_DECODER)       += mpegvideo_xvmc.o
 +OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12dec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
- OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
- OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
 +OBJS-$(CONFIG_MPEG2_MMAL_DECODER)      += mmaldec.o
  OBJS-$(CONFIG_MPEG2_QSV_DECODER)       += qsvdec_mpeg2.o
  OBJS-$(CONFIG_MPEG2_QSV_ENCODER)       += qsvenc_mpeg2.o
+ OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
+ OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
  OBJS-$(CONFIG_MPEG4_DECODER)           += xvididct.o
 +OBJS-$(CONFIG_MPL2_DECODER)            += mpl2dec.o ass.o
+ OBJS-$(CONFIG_MSA1_DECODER)            += mss3.o
  OBJS-$(CONFIG_MSMPEG4V1_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o
  OBJS-$(CONFIG_MSMPEG4V2_DECODER)       += msmpeg4dec.o msmpeg4.o msmpeg4data.o
  OBJS-$(CONFIG_MSMPEG4V2_ENCODER)       += msmpeg4enc.o msmpeg4.o msmpeg4data.o
@@@ -544,13 -445,9 +544,13 @@@ OBJS-$(CONFIG_UTVIDEO_DECODER)         
  OBJS-$(CONFIG_UTVIDEO_ENCODER)         += utvideoenc.o utvideo.o
  OBJS-$(CONFIG_V210_DECODER)            += v210dec.o
  OBJS-$(CONFIG_V210_ENCODER)            += v210enc.o
+ OBJS-$(CONFIG_V210X_DECODER)           += v210x.o
 +OBJS-$(CONFIG_V308_DECODER)            += v308dec.o
 +OBJS-$(CONFIG_V308_ENCODER)            += v308enc.o
 +OBJS-$(CONFIG_V408_DECODER)            += v408dec.o
 +OBJS-$(CONFIG_V408_ENCODER)            += v408enc.o
  OBJS-$(CONFIG_V410_DECODER)            += v410dec.o
  OBJS-$(CONFIG_V410_ENCODER)            += v410enc.o
- OBJS-$(CONFIG_V210X_DECODER)           += v210x.o
  OBJS-$(CONFIG_VB_DECODER)              += vb.o
  OBJS-$(CONFIG_VBLE_DECODER)            += vble.o
  OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1_block.o vc1_loopfilter.o \
@@@ -785,21 -638,17 +785,21 @@@ OBJS-$(CONFIG_FLV_DEMUXER)             
  OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.o
  OBJS-$(CONFIG_IFF_DEMUXER)             += iff.o
  OBJS-$(CONFIG_LATM_MUXER)              += mpeg4audio.o
 -OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += mpeg4audio.o                  \
 +OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += mpeg4audio.o vorbis_data.o    \
                                            flac.o flacdata.o
 -OBJS-$(CONFIG_MATROSKA_MUXER)          += flac.o flacdata.o
 +OBJS-$(CONFIG_MATROSKA_MUXER)          += flac.o flacdata.o vorbis_data.o
+ OBJS-$(CONFIG_MOV_DEMUXER)             += ac3tab.o
  OBJS-$(CONFIG_MP2_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
  OBJS-$(CONFIG_MP3_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
- OBJS-$(CONFIG_MOV_DEMUXER)             += ac3tab.o
  OBJS-$(CONFIG_MPEGTS_MUXER)            += mpeg4audio.o
 +OBJS-$(CONFIG_MXF_MUXER)               += dnxhddata.o
  OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
 +OBJS-$(CONFIG_NUT_DEMUXER)             += mpegaudiodata.o mpeg4audio.o
 +OBJS-$(CONFIG_OGA_MUXER)               += flac.o flacdata.o
  OBJS-$(CONFIG_OGG_DEMUXER)             += mpeg12data.o \
 -                                          dirac.o
 -OBJS-$(CONFIG_OGG_MUXER)               += flac.o flacdata.o
 +                                          dirac.o vorbis_data.o
 +OBJS-$(CONFIG_OGG_MUXER)               += flac.o flacdata.o \
 +                                          vorbis_data.o
  OBJS-$(CONFIG_RTP_MUXER)               += mpeg4audio.o
  OBJS-$(CONFIG_SPDIF_DEMUXER)           += aacadtsdec.o mpeg4audio.o
  OBJS-$(CONFIG_SPDIF_MUXER)             += dca.o
@@@ -881,12 -702,11 +881,12 @@@ OBJS-$(CONFIG_LIBX264_ENCODER
  OBJS-$(CONFIG_LIBX265_ENCODER)            += libx265.o
  OBJS-$(CONFIG_LIBXAVS_ENCODER)            += libxavs.o
  OBJS-$(CONFIG_LIBXVID_ENCODER)            += libxvid.o
 +OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER)   += libzvbi-teletextdec.o
  
  # parsers
+ OBJS-$(CONFIG_AAC_LATM_PARSER)         += latm_parser.o
  OBJS-$(CONFIG_AAC_PARSER)              += aac_parser.o aac_ac3_parser.o \
                                            aacadtsdec.o mpeg4audio.o
- OBJS-$(CONFIG_AAC_LATM_PARSER)         += latm_parser.o
  OBJS-$(CONFIG_AC3_PARSER)              += ac3_parser.o ac3tab.o \
                                            aac_ac3_parser.o
  OBJS-$(CONFIG_ADX_PARSER)              += adx_parser.o adx.o
@@@ -982,27 -780,15 +982,27 @@@ SKIPHEADERS-$(CONFIG_MEDIACODEC)       
  SKIPHEADERS-$(CONFIG_QSV)              += qsv.h qsv_internal.h
  SKIPHEADERS-$(CONFIG_QSVDEC)           += qsvdec.h
  SKIPHEADERS-$(CONFIG_QSVENC)           += qsvenc.h
 +SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
  SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_encode.h vaapi_internal.h
 -SKIPHEADERS-$(CONFIG_VDA)              += vda.h vda_internal.h
 +SKIPHEADERS-$(CONFIG_VDA)              += vda.h vda_vt_internal.h
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
 +SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += videotoolbox.h vda_vt_internal.h
 +
 +TESTPROGS = imgconvert                                                  \
 +            jpeg2000dwt                                                 \
 +            mathops                                                    \
 +            options                                                     \
 +            utils                                                       \
 +            avfft                                                       \
  
 -TESTPROGS-$(CONFIG_FFT)                   += fft fft-fixed
 +TESTPROGS-$(CONFIG_CABAC)                 += cabac
 +TESTPROGS-$(CONFIG_FFT)                   += fft fft-fixed fft-fixed32
+ TESTPROGS-$(CONFIG_GOLOMB)                += golomb
  TESTPROGS-$(CONFIG_IDCTDSP)               += dct
  TESTPROGS-$(CONFIG_IIRFILTER)             += iirfilter
- TESTPROGS-$(CONFIG_GOLOMB)                += golomb
 +TESTPROGS-$(HAVE_MMX)                     += motion
  TESTPROGS-$(CONFIG_RANGECODER)            += rangecoder
 +TESTPROGS-$(CONFIG_SNOW_ENCODER)          += snowenc
  
  TESTOBJS = dctref.o
  
@@@ -1048,17 -829,14 +1048,17 @@@ $(GEN_HEADERS): $(SUBDIR)%_tables.h: $(
        $(M)./$< > $@
  
  ifdef CONFIG_HARDCODED_TABLES
 -$(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h
 -$(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h
 -$(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h
 +$(SUBDIR)cbrt_data.o: $(SUBDIR)cbrt_tables.h
 +$(SUBDIR)cbrt_data_fixed.o: $(SUBDIR)cbrt_fixed_tables.h
 +$(SUBDIR)aacps_float.o: $(SUBDIR)aacps_tables.h
 +$(SUBDIR)aacps_fixed.o: $(SUBDIR)aacps_fixed_tables.h
 +$(SUBDIR)aactab_fixed.o: $(SUBDIR)aac_fixed_tables.h
  $(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h
- $(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h
- $(SUBDIR)sinewin_fixed.o: $(SUBDIR)sinewin_fixed_tables.h
+ $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
  $(SUBDIR)mpegaudiodec_fixed.o: $(SUBDIR)mpegaudio_tables.h
  $(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h
- $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
  $(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h
  $(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h
+ $(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h
++$(SUBDIR)sinewin_fixed.o: $(SUBDIR)sinewin_fixed_tables.h
  endif
@@@ -28,7 -36,10 +35,9 @@@ NEON-OBJS-$(CONFIG_H264QPEL
                                             aarch64/hpeldsp_neon.o
  NEON-OBJS-$(CONFIG_HPELDSP)             += aarch64/hpeldsp_neon.o
  NEON-OBJS-$(CONFIG_IMDCT15)             += aarch64/imdct15_neon.o
- NEON-OBJS-$(CONFIG_MPEGAUDIODSP)        += aarch64/mpegaudiodsp_neon.o
  NEON-OBJS-$(CONFIG_MDCT)                += aarch64/mdct_neon.o
+ NEON-OBJS-$(CONFIG_MPEGAUDIODSP)        += aarch64/mpegaudiodsp_neon.o
  
 -NEON-OBJS-$(CONFIG_DCA_DECODER)         += aarch64/dcadsp_neon.o               \
 -                                           aarch64/synth_filter_neon.o
+ # decoders/encoders
++NEON-OBJS-$(CONFIG_DCA_DECODER)         += aarch64/synth_filter_neon.o
  NEON-OBJS-$(CONFIG_VORBIS_DECODER)      += aarch64/vorbisdsp_neon.o
@@@ -18,10 -21,8 +21,7 @@@ OBJS-$(CONFIG_IDCTDSP)                 
                                            arm/idctdsp_arm.o             \
                                            arm/jrevdct_arm.o             \
                                            arm/simple_idct_arm.o
- OBJS-$(CONFIG_FLACDSP)                 += arm/flacdsp_init_arm.o        \
-                                           arm/flacdsp_arm.o
- OBJS-$(CONFIG_G722DSP)                 += arm/g722dsp_init_arm.o
 -OBJS-$(CONFIG_MDCT)                    += arm/mdct_init_arm.o           \
 -                                          arm/mdct_fixed_init_arm.o
 +OBJS-$(CONFIG_LLAUDDSP)                += arm/lossless_audiodsp_init_arm.o
  OBJS-$(CONFIG_ME_CMP)                  += arm/me_cmp_init_arm.o
  OBJS-$(CONFIG_MPEGAUDIODSP)            += arm/mpegaudiodsp_init_arm.o
  OBJS-$(CONFIG_MPEGVIDEO)               += arm/mpegvideo_arm.o
@@@ -2,16 -2,16 +2,16 @@@
  OBJS-$(CONFIG_AUDIODSP)                += ppc/audiodsp.o
  OBJS-$(CONFIG_BLOCKDSP)                += ppc/blockdsp.o
  OBJS-$(CONFIG_FFT)                     += ppc/fft_init.o                \
 -                                          ppc/fft_altivec.o
 +                                          ppc/fft_altivec.o             \
 +                                          ppc/fft_vsx.o
+ OBJS-$(CONFIG_FDCTDSP)                 += ppc/fdctdsp.o
  OBJS-$(CONFIG_FMTCONVERT)              += ppc/fmtconvert_altivec.o
  OBJS-$(CONFIG_H264CHROMA)              += ppc/h264chroma_init.o
 -OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp.o
 +OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp.o ppc/hpeldsp_altivec.o
  OBJS-$(CONFIG_H264QPEL)                += ppc/h264qpel.o
  OBJS-$(CONFIG_HPELDSP)                 += ppc/hpeldsp_altivec.o
  OBJS-$(CONFIG_HUFFYUVDSP)              += ppc/huffyuvdsp_altivec.o
- OBJS-$(CONFIG_FDCTDSP)                 += ppc/fdctdsp.o
  OBJS-$(CONFIG_IDCTDSP)                 += ppc/idctdsp.o
 -OBJS-$(CONFIG_MDCT)                    += ppc/mdct_init.o
  OBJS-$(CONFIG_ME_CMP)                  += ppc/me_cmp.o
  OBJS-$(CONFIG_MPEGAUDIODSP)            += ppc/mpegaudiodsp_altivec.o
  OBJS-$(CONFIG_MPEGVIDEO)               += ppc/mpegvideo_altivec.o      \
@@@ -7,43 -5,23 +7,45 @@@ HEADERS = avdevice.
  
  OBJS    = alldevices.o                                                  \
            avdevice.o                                                    \
 +          utils.o                                                       \
  
+ OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
  # input/output devices
 -OBJS-$(CONFIG_ALSA_INDEV)                += alsa_dec.o alsa.o
 +OBJS-$(CONFIG_ALSA_INDEV)                += alsa_dec.o alsa.o timefilter.o
  OBJS-$(CONFIG_ALSA_OUTDEV)               += alsa_enc.o alsa.o
 -OBJS-$(CONFIG_AVFOUNDATION_INDEV)        += avfoundation_dec.o
 +OBJS-$(CONFIG_AVFOUNDATION_INDEV)        += avfoundation.o
  OBJS-$(CONFIG_BKTR_INDEV)                += bktr.o
 +OBJS-$(CONFIG_CACA_OUTDEV)               += caca.o
 +OBJS-$(CONFIG_DECKLINK_OUTDEV)           += decklink_enc.o decklink_enc_c.o decklink_common.o
 +OBJS-$(CONFIG_DECKLINK_INDEV)            += decklink_dec.o decklink_dec_c.o decklink_common.o
 +OBJS-$(CONFIG_DSHOW_INDEV)               += dshow_crossbar.o dshow.o dshow_enummediatypes.o \
 +                                            dshow_enumpins.o dshow_filter.o \
 +                                            dshow_pin.o dshow_common.o
  OBJS-$(CONFIG_DV1394_INDEV)              += dv1394.o
 -OBJS-$(CONFIG_FBDEV_INDEV)               += fbdev.o
 +OBJS-$(CONFIG_FBDEV_INDEV)               += fbdev_dec.o \
 +                                            fbdev_common.o
 +OBJS-$(CONFIG_FBDEV_OUTDEV)              += fbdev_enc.o \
 +                                            fbdev_common.o
 +OBJS-$(CONFIG_GDIGRAB_INDEV)             += gdigrab.o
 +OBJS-$(CONFIG_IEC61883_INDEV)            += iec61883.o
  OBJS-$(CONFIG_JACK_INDEV)                += jack.o timefilter.o
 +OBJS-$(CONFIG_LAVFI_INDEV)               += lavfi.o
 +OBJS-$(CONFIG_OPENAL_INDEV)              += openal-dec.o
 +OBJS-$(CONFIG_OPENGL_OUTDEV)             += opengl_enc.o
  OBJS-$(CONFIG_OSS_INDEV)                 += oss_dec.o oss.o
  OBJS-$(CONFIG_OSS_OUTDEV)                += oss_enc.o oss.o
 -OBJS-$(CONFIG_PULSE_INDEV)               += pulse.o
 +OBJS-$(CONFIG_PULSE_INDEV)               += pulse_audio_dec.o \
 +                                            pulse_audio_common.o timefilter.o
 +OBJS-$(CONFIG_PULSE_OUTDEV)              += pulse_audio_enc.o \
 +                                            pulse_audio_common.o
 +OBJS-$(CONFIG_QTKIT_INDEV)               += qtkit.o
 +OBJS-$(CONFIG_SDL_OUTDEV)                += sdl.o
  OBJS-$(CONFIG_SNDIO_INDEV)               += sndio_dec.o sndio.o
  OBJS-$(CONFIG_SNDIO_OUTDEV)              += sndio_enc.o sndio.o
 -OBJS-$(CONFIG_V4L2_INDEV)                += v4l2.o
 +OBJS-$(CONFIG_V4L2_INDEV)                += v4l2.o v4l2-common.o timefilter.o
 +OBJS-$(CONFIG_V4L2_OUTDEV)               += v4l2enc.o v4l2-common.o
 +OBJS-$(CONFIG_V4L_INDEV)                 += v4l.o
  OBJS-$(CONFIG_VFWCAP_INDEV)              += vfwcap.o
  OBJS-$(CONFIG_X11GRAB_INDEV)             += x11grab.o
  OBJS-$(CONFIG_X11GRAB_XCB_INDEV)         += xcbgrab.o
@@@ -53,20 -30,6 +55,18 @@@ OBJS-$(CONFIG_XV_OUTDEV
  OBJS-$(CONFIG_LIBCDIO_INDEV)             += libcdio.o
  OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
  
- OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)             += avdeviceres.o
 +
 +SKIPHEADERS                              += decklink_common.h
 +SKIPHEADERS-$(CONFIG_DECKLINK)           += decklink_enc.h decklink_dec.h \
 +                                            decklink_common_c.h
 +SKIPHEADERS-$(CONFIG_DSHOW_INDEV)        += dshow_capture.h
 +SKIPHEADERS-$(CONFIG_FBDEV_INDEV)        += fbdev_common.h
 +SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV)       += fbdev_common.h
 +SKIPHEADERS-$(CONFIG_LIBPULSE)           += pulse_audio_common.h
 +SKIPHEADERS-$(CONFIG_V4L2_INDEV)         += v4l2-common.h
 +SKIPHEADERS-$(CONFIG_V4L2_OUTDEV)        += v4l2-common.h
  SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa.h
  SKIPHEADERS-$(HAVE_SNDIO_H)              += sndio.h
  
@@@ -17,45 -15,16 +17,48 @@@ OBJS = allfilters.
         drawutils.o                                                      \
         fifo.o                                                           \
         formats.o                                                        \
 +       framepool.o                                                      \
 +       graphdump.o                                                      \
         graphparser.o                                                    \
 +       opencl_allkernels.o                                              \
 +       transform.o                                                      \
         video.o                                                          \
  
+ OBJS-$(HAVE_THREADS)                         += pthread.o
+ # audio filters
 +OBJS-$(CONFIG_ABENCH_FILTER)                 += f_bench.o
 +OBJS-$(CONFIG_ACOMPRESSOR_FILTER)            += af_sidechaincompress.o
 +OBJS-$(CONFIG_ACROSSFADE_FILTER)             += af_afade.o
 +OBJS-$(CONFIG_ADELAY_FILTER)                 += af_adelay.o
 +OBJS-$(CONFIG_AECHO_FILTER)                  += af_aecho.o
 +OBJS-$(CONFIG_AEMPHASIS_FILTER)              += af_aemphasis.o
 +OBJS-$(CONFIG_AFFTFILT_FILTER)               += af_afftfilt.o window_func.o
 +OBJS-$(CONFIG_ANEQUALIZER_FILTER)            += af_anequalizer.o
 +OBJS-$(CONFIG_AEVAL_FILTER)                  += aeval.o
 +OBJS-$(CONFIG_AFADE_FILTER)                  += af_afade.o
  OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o
 +OBJS-$(CONFIG_AGATE_FILTER)                  += af_agate.o
 +OBJS-$(CONFIG_AINTERLEAVE_FILTER)            += f_interleave.o
 +OBJS-$(CONFIG_ALIMITER_FILTER)               += af_alimiter.o
 +OBJS-$(CONFIG_ALLPASS_FILTER)                += af_biquads.o
 +OBJS-$(CONFIG_ALOOP_FILTER)                  += f_loop.o
 +OBJS-$(CONFIG_AMERGE_FILTER)                 += af_amerge.o
 +OBJS-$(CONFIG_AMETADATA_FILTER)              += f_metadata.o
  OBJS-$(CONFIG_AMIX_FILTER)                   += af_amix.o
  OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o
 +OBJS-$(CONFIG_APAD_FILTER)                   += af_apad.o
 +OBJS-$(CONFIG_APERMS_FILTER)                 += f_perms.o
 +OBJS-$(CONFIG_APHASER_FILTER)                += af_aphaser.o generate_wave_table.o
 +OBJS-$(CONFIG_APULSATOR_FILTER)              += af_apulsator.o
 +OBJS-$(CONFIG_AREALTIME_FILTER)              += f_realtime.o
 +OBJS-$(CONFIG_ARESAMPLE_FILTER)              += af_aresample.o
 +OBJS-$(CONFIG_AREVERSE_FILTER)               += f_reverse.o
 +OBJS-$(CONFIG_ASELECT_FILTER)                += f_select.o
 +OBJS-$(CONFIG_ASENDCMD_FILTER)               += f_sendcmd.o
 +OBJS-$(CONFIG_ASETNSAMPLES_FILTER)           += af_asetnsamples.o
  OBJS-$(CONFIG_ASETPTS_FILTER)                += setpts.o
 +OBJS-$(CONFIG_ASETRATE_FILTER)               += af_asetrate.o
  OBJS-$(CONFIG_ASETTB_FILTER)                 += settb.o
  OBJS-$(CONFIG_ASHOWINFO_FILTER)              += af_ashowinfo.o
  OBJS-$(CONFIG_ASPLIT_FILTER)                 += split.o
@@@ -72,130 -33,36 +75,132 @@@ OBJS-$(CONFIG_BIQUAD_FILTER
  OBJS-$(CONFIG_BS2B_FILTER)                   += af_bs2b.o
  OBJS-$(CONFIG_CHANNELMAP_FILTER)             += af_channelmap.o
  OBJS-$(CONFIG_CHANNELSPLIT_FILTER)           += af_channelsplit.o
 +OBJS-$(CONFIG_CHORUS_FILTER)                 += af_chorus.o generate_wave_table.o
  OBJS-$(CONFIG_COMPAND_FILTER)                += af_compand.o
 +OBJS-$(CONFIG_COMPENSATIONDELAY_FILTER)      += af_compensationdelay.o
 +OBJS-$(CONFIG_DCSHIFT_FILTER)                += af_dcshift.o
 +OBJS-$(CONFIG_DYNAUDNORM_FILTER)             += af_dynaudnorm.o
 +OBJS-$(CONFIG_EARWAX_FILTER)                 += af_earwax.o
 +OBJS-$(CONFIG_EBUR128_FILTER)                += f_ebur128.o
 +OBJS-$(CONFIG_EQUALIZER_FILTER)              += af_biquads.o
 +OBJS-$(CONFIG_EXTRASTEREO_FILTER)            += af_extrastereo.o
 +OBJS-$(CONFIG_FIREQUALIZER_FILTER)           += af_firequalizer.o
 +OBJS-$(CONFIG_FLANGER_FILTER)                += af_flanger.o generate_wave_table.o
 +OBJS-$(CONFIG_HIGHPASS_FILTER)               += af_biquads.o
  OBJS-$(CONFIG_JOIN_FILTER)                   += af_join.o
 +OBJS-$(CONFIG_LADSPA_FILTER)                 += af_ladspa.o
 +OBJS-$(CONFIG_LOWPASS_FILTER)                += af_biquads.o
 +OBJS-$(CONFIG_PAN_FILTER)                    += af_pan.o
 +OBJS-$(CONFIG_REPLAYGAIN_FILTER)             += af_replaygain.o
  OBJS-$(CONFIG_RESAMPLE_FILTER)               += af_resample.o
 +OBJS-$(CONFIG_RUBBERBAND_FILTER)             += af_rubberband.o
 +OBJS-$(CONFIG_SIDECHAINCOMPRESS_FILTER)      += af_sidechaincompress.o
 +OBJS-$(CONFIG_SIDECHAINGATE_FILTER)          += af_agate.o
 +OBJS-$(CONFIG_SILENCEDETECT_FILTER)          += af_silencedetect.o
 +OBJS-$(CONFIG_SILENCEREMOVE_FILTER)          += af_silenceremove.o
 +OBJS-$(CONFIG_SOFALIZER_FILTER)              += af_sofalizer.o
 +OBJS-$(CONFIG_STEREOTOOLS_FILTER)            += af_stereotools.o
 +OBJS-$(CONFIG_STEREOWIDEN_FILTER)            += af_stereowiden.o
 +OBJS-$(CONFIG_TREBLE_FILTER)                 += af_biquads.o
 +OBJS-$(CONFIG_TREMOLO_FILTER)                += af_tremolo.o
 +OBJS-$(CONFIG_VIBRATO_FILTER)                += af_vibrato.o generate_wave_table.o
  OBJS-$(CONFIG_VOLUME_FILTER)                 += af_volume.o
- OBJS-$(CONFIG_ANULLSRC_FILTER)               += asrc_anullsrc.o
 +OBJS-$(CONFIG_VOLUMEDETECT_FILTER)           += af_volumedetect.o
 +OBJS-$(CONFIG_HDCD_FILTER)                   += af_hdcd.o
 +
 +OBJS-$(CONFIG_AEVALSRC_FILTER)               += aeval.o
 +OBJS-$(CONFIG_ANOISESRC_FILTER)              += asrc_anoisesrc.o
 +OBJS-$(CONFIG_FLITE_FILTER)                  += asrc_flite.o
 +OBJS-$(CONFIG_SINE_FILTER)                   += asrc_sine.o
  
  OBJS-$(CONFIG_ANULLSINK_FILTER)              += asink_anullsink.o
+ OBJS-$(CONFIG_ANULLSRC_FILTER)               += asrc_anullsrc.o
  
 +OBJS-$(CONFIG_ASS_FILTER)                    += vf_subtitles.o
 +OBJS-$(CONFIG_ALPHAEXTRACT_FILTER)           += vf_extractplanes.o
 +OBJS-$(CONFIG_ALPHAMERGE_FILTER)             += vf_alphamerge.o
 +OBJS-$(CONFIG_ATADENOISE_FILTER)             += vf_atadenoise.o
 +OBJS-$(CONFIG_BBOX_FILTER)                   += bbox.o vf_bbox.o
 +OBJS-$(CONFIG_BENCH_FILTER)                  += f_bench.o
 +OBJS-$(CONFIG_BLACKDETECT_FILTER)            += vf_blackdetect.o
++
+ # video filters
  OBJS-$(CONFIG_BLACKFRAME_FILTER)             += vf_blackframe.o
 +OBJS-$(CONFIG_BLEND_FILTER)                  += vf_blend.o dualinput.o framesync.o
  OBJS-$(CONFIG_BOXBLUR_FILTER)                += vf_boxblur.o
 +OBJS-$(CONFIG_BWDIF_FILTER)                  += vf_bwdif.o
 +OBJS-$(CONFIG_CHROMAKEY_FILTER)              += vf_chromakey.o
 +OBJS-$(CONFIG_CIESCOPE_FILTER)               += vf_ciescope.o
 +OBJS-$(CONFIG_CODECVIEW_FILTER)              += vf_codecview.o
 +OBJS-$(CONFIG_COLORBALANCE_FILTER)           += vf_colorbalance.o
 +OBJS-$(CONFIG_COLORCHANNELMIXER_FILTER)      += vf_colorchannelmixer.o
 +OBJS-$(CONFIG_COLORKEY_FILTER)               += vf_colorkey.o
 +OBJS-$(CONFIG_COLORLEVELS_FILTER)            += vf_colorlevels.o
 +OBJS-$(CONFIG_COLORMATRIX_FILTER)            += vf_colormatrix.o
 +OBJS-$(CONFIG_COLORSPACE_FILTER)             += vf_colorspace.o colorspacedsp.o
 +OBJS-$(CONFIG_CONVOLUTION_FILTER)            += vf_convolution.o
  OBJS-$(CONFIG_COPY_FILTER)                   += vf_copy.o
 +OBJS-$(CONFIG_COREIMAGE_FILTER)              += vf_coreimage.o
 +OBJS-$(CONFIG_COVER_RECT_FILTER)             += vf_cover_rect.o lavfutils.o
  OBJS-$(CONFIG_CROP_FILTER)                   += vf_crop.o
  OBJS-$(CONFIG_CROPDETECT_FILTER)             += vf_cropdetect.o
 +OBJS-$(CONFIG_CURVES_FILTER)                 += vf_curves.o
 +OBJS-$(CONFIG_DATASCOPE_FILTER)              += vf_datascope.o
 +OBJS-$(CONFIG_DCTDNOIZ_FILTER)               += vf_dctdnoiz.o
 +OBJS-$(CONFIG_DEBAND_FILTER)                 += vf_deband.o
 +OBJS-$(CONFIG_DECIMATE_FILTER)               += vf_decimate.o
 +OBJS-$(CONFIG_DEFLATE_FILTER)                += vf_neighbor.o
 +OBJS-$(CONFIG_DEJUDDER_FILTER)               += vf_dejudder.o
  OBJS-$(CONFIG_DELOGO_FILTER)                 += vf_delogo.o
 +OBJS-$(CONFIG_DESHAKE_FILTER)                += vf_deshake.o
 +OBJS-$(CONFIG_DETELECINE_FILTER)             += vf_detelecine.o
 +OBJS-$(CONFIG_DILATION_FILTER)               += vf_neighbor.o
 +OBJS-$(CONFIG_DISPLACE_FILTER)               += vf_displace.o framesync.o
  OBJS-$(CONFIG_DRAWBOX_FILTER)                += vf_drawbox.o
 +OBJS-$(CONFIG_DRAWGRAPH_FILTER)              += f_drawgraph.o
 +OBJS-$(CONFIG_DRAWGRID_FILTER)               += vf_drawbox.o
  OBJS-$(CONFIG_DRAWTEXT_FILTER)               += vf_drawtext.o
 +OBJS-$(CONFIG_ELBG_FILTER)                   += vf_elbg.o
 +OBJS-$(CONFIG_EDGEDETECT_FILTER)             += vf_edgedetect.o
 +OBJS-$(CONFIG_EQ_FILTER)                     += vf_eq.o
 +OBJS-$(CONFIG_EROSION_FILTER)                += vf_neighbor.o
 +OBJS-$(CONFIG_EXTRACTPLANES_FILTER)          += vf_extractplanes.o
  OBJS-$(CONFIG_FADE_FILTER)                   += vf_fade.o
 +OBJS-$(CONFIG_FFTFILT_FILTER)                += vf_fftfilt.o
 +OBJS-$(CONFIG_FIELD_FILTER)                  += vf_field.o
 +OBJS-$(CONFIG_FIELDHINT_FILTER)              += vf_fieldhint.o
 +OBJS-$(CONFIG_FIELDMATCH_FILTER)             += vf_fieldmatch.o
  OBJS-$(CONFIG_FIELDORDER_FILTER)             += vf_fieldorder.o
 +OBJS-$(CONFIG_FIND_RECT_FILTER)              += vf_find_rect.o lavfutils.o
  OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
  OBJS-$(CONFIG_FPS_FILTER)                    += vf_fps.o
  OBJS-$(CONFIG_FRAMEPACK_FILTER)              += vf_framepack.o
 +OBJS-$(CONFIG_FRAMERATE_FILTER)              += vf_framerate.o
 +OBJS-$(CONFIG_FRAMESTEP_FILTER)              += vf_framestep.o
  OBJS-$(CONFIG_FREI0R_FILTER)                 += vf_frei0r.o
 +OBJS-$(CONFIG_FSPP_FILTER)                   += vf_fspp.o
 +OBJS-$(CONFIG_GEQ_FILTER)                    += vf_geq.o
  OBJS-$(CONFIG_GRADFUN_FILTER)                += vf_gradfun.o
 +OBJS-$(CONFIG_HALDCLUT_FILTER)               += vf_lut3d.o dualinput.o framesync.o
  OBJS-$(CONFIG_HFLIP_FILTER)                  += vf_hflip.o
 +OBJS-$(CONFIG_HISTEQ_FILTER)                 += vf_histeq.o
 +OBJS-$(CONFIG_HISTOGRAM_FILTER)              += vf_histogram.o
  OBJS-$(CONFIG_HQDN3D_FILTER)                 += vf_hqdn3d.o
 +OBJS-$(CONFIG_HQX_FILTER)                    += vf_hqx.o
  OBJS-$(CONFIG_HWDOWNLOAD_FILTER)             += vf_hwdownload.o
- OBJS-$(CONFIG_HWUPLOAD_FILTER)               += vf_hwupload.o
  OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER)          += vf_hwupload_cuda.o
+ OBJS-$(CONFIG_HWUPLOAD_FILTER)               += vf_hwupload.o
 +OBJS-$(CONFIG_HSTACK_FILTER)                 += vf_stack.o framesync.o
 +OBJS-$(CONFIG_HUE_FILTER)                    += vf_hue.o
 +OBJS-$(CONFIG_IDET_FILTER)                   += vf_idet.o
 +OBJS-$(CONFIG_IL_FILTER)                     += vf_il.o
 +OBJS-$(CONFIG_INFLATE_FILTER)                += vf_neighbor.o
  OBJS-$(CONFIG_INTERLACE_FILTER)              += vf_interlace.o
 +OBJS-$(CONFIG_INTERLEAVE_FILTER)             += f_interleave.o
 +OBJS-$(CONFIG_KERNDEINT_FILTER)              += vf_kerndeint.o
 +OBJS-$(CONFIG_LENSCORRECTION_FILTER)         += vf_lenscorrection.o
 +OBJS-$(CONFIG_LOOP_FILTER)                   += f_loop.o
 +OBJS-$(CONFIG_LUT3D_FILTER)                  += vf_lut3d.o
  OBJS-$(CONFIG_LUT_FILTER)                    += vf_lut.o
  OBJS-$(CONFIG_LUTRGB_FILTER)                 += vf_lut.o
  OBJS-$(CONFIG_LUTYUV_FILTER)                 += vf_lut.o
@@@ -272,72 -87,17 +277,70 @@@ OBJS-$(CONFIG_TINTERLACE_FILTER
  OBJS-$(CONFIG_TRANSPOSE_FILTER)              += vf_transpose.o
  OBJS-$(CONFIG_TRIM_FILTER)                   += trim.o
  OBJS-$(CONFIG_UNSHARP_FILTER)                += vf_unsharp.o
 +OBJS-$(CONFIG_USPP_FILTER)                   += vf_uspp.o
 +OBJS-$(CONFIG_VECTORSCOPE_FILTER)            += vf_vectorscope.o
  OBJS-$(CONFIG_VFLIP_FILTER)                  += vf_vflip.o
 +OBJS-$(CONFIG_VIDSTABDETECT_FILTER)          += vidstabutils.o vf_vidstabdetect.o
 +OBJS-$(CONFIG_VIDSTABTRANSFORM_FILTER)       += vidstabutils.o vf_vidstabtransform.o
 +OBJS-$(CONFIG_VIGNETTE_FILTER)               += vf_vignette.o
 +OBJS-$(CONFIG_VSTACK_FILTER)                 += vf_stack.o framesync.o
 +OBJS-$(CONFIG_W3FDIF_FILTER)                 += vf_w3fdif.o
 +OBJS-$(CONFIG_WAVEFORM_FILTER)               += vf_waveform.o
 +OBJS-$(CONFIG_XBR_FILTER)                    += vf_xbr.o
  OBJS-$(CONFIG_YADIF_FILTER)                  += vf_yadif.o
 +OBJS-$(CONFIG_ZMQ_FILTER)                    += f_zmq.o
 +OBJS-$(CONFIG_ZOOMPAN_FILTER)                += vf_zoompan.o
 +OBJS-$(CONFIG_ZSCALE_FILTER)                 += vf_zscale.o
  
 -
 -OBJS-$(CONFIG_COLOR_FILTER)                  += vsrc_color.o
 +OBJS-$(CONFIG_ALLRGB_FILTER)                 += vsrc_testsrc.o
 +OBJS-$(CONFIG_ALLYUV_FILTER)                 += vsrc_testsrc.o
 +OBJS-$(CONFIG_CELLAUTO_FILTER)               += vsrc_cellauto.o
+ OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
 +OBJS-$(CONFIG_COLOR_FILTER)                  += vsrc_testsrc.o
 +OBJS-$(CONFIG_COREIMAGESRC_FILTER)           += vf_coreimage.o
  OBJS-$(CONFIG_FREI0R_SRC_FILTER)             += vf_frei0r.o
 -OBJS-$(CONFIG_MOVIE_FILTER)                  += vsrc_movie.o
 -OBJS-$(CONFIG_NULLSRC_FILTER)                += vsrc_nullsrc.o
 +OBJS-$(CONFIG_HALDCLUTSRC_FILTER)            += vsrc_testsrc.o
 +OBJS-$(CONFIG_LIFE_FILTER)                   += vsrc_life.o
 +OBJS-$(CONFIG_MANDELBROT_FILTER)             += vsrc_mandelbrot.o
 +OBJS-$(CONFIG_MPTESTSRC_FILTER)              += vsrc_mptestsrc.o
 +OBJS-$(CONFIG_NULLSRC_FILTER)                += vsrc_testsrc.o
  OBJS-$(CONFIG_RGBTESTSRC_FILTER)             += vsrc_testsrc.o
 +OBJS-$(CONFIG_SMPTEBARS_FILTER)              += vsrc_testsrc.o
 +OBJS-$(CONFIG_SMPTEHDBARS_FILTER)            += vsrc_testsrc.o
  OBJS-$(CONFIG_TESTSRC_FILTER)                += vsrc_testsrc.o
- OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
 +OBJS-$(CONFIG_TESTSRC2_FILTER)               += vsrc_testsrc.o
 +
- OBJS-$(HAVE_THREADS)                         += pthread.o
 +# multimedia filters
 +OBJS-$(CONFIG_ADRAWGRAPH_FILTER)             += f_drawgraph.o
 +OBJS-$(CONFIG_AHISTOGRAM_FILTER)             += avf_ahistogram.o
 +OBJS-$(CONFIG_APHASEMETER_FILTER)            += avf_aphasemeter.o
 +OBJS-$(CONFIG_AVECTORSCOPE_FILTER)           += avf_avectorscope.o
 +OBJS-$(CONFIG_CONCAT_FILTER)                 += avf_concat.o
 +OBJS-$(CONFIG_SHOWCQT_FILTER)                += avf_showcqt.o lswsutils.o lavfutils.o
 +OBJS-$(CONFIG_SHOWFREQS_FILTER)              += avf_showfreqs.o window_func.o
 +OBJS-$(CONFIG_SHOWSPECTRUM_FILTER)           += avf_showspectrum.o window_func.o
 +OBJS-$(CONFIG_SHOWSPECTRUMPIC_FILTER)        += avf_showspectrum.o window_func.o
 +OBJS-$(CONFIG_SHOWVOLUME_FILTER)             += avf_showvolume.o
 +OBJS-$(CONFIG_SHOWWAVES_FILTER)              += avf_showwaves.o
 +OBJS-$(CONFIG_SHOWWAVESPIC_FILTER)           += avf_showwaves.o
 +OBJS-$(CONFIG_SPECTRUMSYNTH_FILTER)          += vaf_spectrumsynth.o window_func.o
 +
 +# multimedia sources
 +OBJS-$(CONFIG_AMOVIE_FILTER)                 += src_movie.o
 +OBJS-$(CONFIG_MOVIE_FILTER)                  += src_movie.o
 +
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)                 += avfilterres.o
 +
 +SKIPHEADERS-$(CONFIG_LIBVIDSTAB)             += vidstabutils.h
 +SKIPHEADERS-$(CONFIG_OPENCL)                 += opencl_internal.h deshake_opencl_kernel.h unsharp_opencl_kernel.h
 +
 +OBJS-$(CONFIG_SHARED)                        += log2_tab.o
  
  TOOLS     = graph2dot
 -TESTPROGS = filtfmts
 +TESTPROGS = drawutils filtfmts formats
 +
 +TOOLS-$(CONFIG_LIBZMQ) += zmqsend
 +
 +clean::
 +      $(RM) $(CLEANSUFFIXES:%=libavfilter/libmpcodecs/%)
@@@ -64,25 -62,15 +66,25 @@@ OBJS-$(CONFIG_SRTP
  
  # muxers/demuxers
  OBJS-$(CONFIG_A64_MUXER)                 += a64.o rawenc.o
 -OBJS-$(CONFIG_AAC_DEMUXER)               += aacdec.o rawdec.o
 +OBJS-$(CONFIG_AA_DEMUXER)                += aadec.o
 +OBJS-$(CONFIG_AAC_DEMUXER)               += aacdec.o apetag.o img2.o rawdec.o
  OBJS-$(CONFIG_AC3_DEMUXER)               += ac3dec.o rawdec.o
  OBJS-$(CONFIG_AC3_MUXER)                 += rawenc.o
 -OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o
 +OBJS-$(CONFIG_ACM_DEMUXER)               += acm.o rawdec.o
 +OBJS-$(CONFIG_ACT_DEMUXER)               += act.o
 +OBJS-$(CONFIG_ADF_DEMUXER)               += bintext.o sauce.o
 +OBJS-$(CONFIG_ADP_DEMUXER)               += adp.o
 +OBJS-$(CONFIG_ADS_DEMUXER)               += ads.o
- OBJS-$(CONFIG_ADX_DEMUXER)               += adxdec.o
- OBJS-$(CONFIG_ADX_MUXER)                 += rawenc.o
 +OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o apetag.o img2.o \
 +                                            id3v2enc.o
+ OBJS-$(CONFIG_ADX_DEMUXER)               += adxdec.o
+ OBJS-$(CONFIG_ADX_MUXER)                 += rawenc.o
  OBJS-$(CONFIG_AEA_DEMUXER)               += aea.o pcm.o
 -OBJS-$(CONFIG_AIFF_DEMUXER)              += aiffdec.o pcm.o
 -OBJS-$(CONFIG_AIFF_MUXER)                += aiffenc.o
 +OBJS-$(CONFIG_AFC_DEMUXER)               += afc.o
 +OBJS-$(CONFIG_AIFF_DEMUXER)              += aiffdec.o pcm.o isom.o \
 +                                            mov_chan.o
 +OBJS-$(CONFIG_AIFF_MUXER)                += aiffenc.o isom.o id3v2enc.o
 +OBJS-$(CONFIG_AIX_DEMUXER)               += aixdec.o
  OBJS-$(CONFIG_AMR_DEMUXER)               += amr.o
  OBJS-$(CONFIG_AMR_MUXER)                 += amr.o
  OBJS-$(CONFIG_ANM_DEMUXER)               += anm.o
@@@ -392,10 -296,9 +394,10 @@@ OBJS-$(CONFIG_RM_DEMUXER
  OBJS-$(CONFIG_RM_MUXER)                  += rmenc.o rm.o
  OBJS-$(CONFIG_ROQ_DEMUXER)               += idroqdec.o
  OBJS-$(CONFIG_ROQ_MUXER)                 += idroqenc.o rawenc.o
 +OBJS-$(CONFIG_RSD_DEMUXER)               += rsd.o
+ OBJS-$(CONFIG_RPL_DEMUXER)               += rpl.o
  OBJS-$(CONFIG_RSO_DEMUXER)               += rsodec.o rso.o pcm.o
  OBJS-$(CONFIG_RSO_MUXER)                 += rsoenc.o rso.o
- OBJS-$(CONFIG_RPL_DEMUXER)               += rpl.o
  OBJS-$(CONFIG_RTP_MPEGTS_MUXER)          += rtpenc_mpegts.o
  OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o         \
                                              rtpenc_aac.o     \
@@@ -486,50 -363,27 +488,50 @@@ OBJS-$(CONFIG_WC3_DEMUXER
  OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \
                                              avc.o hevc.o \
                                              flacenc_header.o avlanguage.o \
 -                                            wv.o vorbiscomment.o
 +                                            wv.o vorbiscomment.o \
 +                                            webmdashenc.o webm_chunk.o
 +OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER)  += webmdashenc.o matroska.o
 +OBJS-$(CONFIG_WEBM_CHUNK_MUXER)          += webm_chunk.o matroska.o
 +OBJS-$(CONFIG_WEBP_MUXER)                += webpenc.o
 +OBJS-$(CONFIG_WEBVTT_DEMUXER)            += webvttdec.o subtitles.o
 +OBJS-$(CONFIG_WEBVTT_MUXER)              += webvttenc.o
  OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood_aud.o
 +OBJS-$(CONFIG_WSD_DEMUXER)               += wsddec.o rawdec.o
  OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood_vqa.o
 -OBJS-$(CONFIG_WTV_DEMUXER)               += wtv.o asfdec.o asf.o asfcrypt.o \
 +OBJS-$(CONFIG_WTV_DEMUXER)               += wtvdec.o wtv_common.o asf.o \
                                              avlanguage.o
 +OBJS-$(CONFIG_WTV_MUXER)                 += wtvenc.o wtv_common.o \
 +                                            asf.o
  OBJS-$(CONFIG_WV_DEMUXER)                += wvdec.o wv.o apetag.o img2.o
 +OBJS-$(CONFIG_WVE_DEMUXER)               += wvedec.o pcm.o
  OBJS-$(CONFIG_WV_MUXER)                  += wvenc.o wv.o apetag.o img2.o
  OBJS-$(CONFIG_XA_DEMUXER)                += xa.o
 +OBJS-$(CONFIG_XBIN_DEMUXER)              += bintext.o sauce.o
  OBJS-$(CONFIG_XMV_DEMUXER)               += xmv.o
 +OBJS-$(CONFIG_XVAG_DEMUXER)              += xvag.o
  OBJS-$(CONFIG_XWMA_DEMUXER)              += xwma.o
  OBJS-$(CONFIG_YOP_DEMUXER)               += yop.o
- OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpegenc.o
  OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpegdec.o
+ OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpegenc.o
  
  # external libraries
 +OBJS-$(CONFIG_CHROMAPRINT_MUXER)         += chromaprint.o
 +OBJS-$(CONFIG_LIBGME_DEMUXER)            += libgme.o
 +OBJS-$(CONFIG_LIBMODPLUG_DEMUXER)        += libmodplug.o
 +OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o
 +OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o
  OBJS-$(CONFIG_LIBRTMP)                   += librtmp.o
 +OBJS-$(CONFIG_LIBSSH_PROTOCOL)           += libssh.o
 +OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL)     += libsmbclient.o
  
  # protocols I/O
 +OBJS-$(CONFIG_ASYNC_PROTOCOL)            += async.o
  OBJS-$(CONFIG_APPLEHTTP_PROTOCOL)        += hlsproto.o
 +OBJS-$(CONFIG_BLURAY_PROTOCOL)           += bluray.o
 +OBJS-$(CONFIG_CACHE_PROTOCOL)            += cache.o
  OBJS-$(CONFIG_CONCAT_PROTOCOL)           += concat.o
  OBJS-$(CONFIG_CRYPTO_PROTOCOL)           += crypto.o
 +OBJS-$(CONFIG_DATA_PROTOCOL)             += data_uri.o
  OBJS-$(CONFIG_FFRTMPCRYPT_PROTOCOL)      += rtmpcrypt.o rtmpdh.o
  OBJS-$(CONFIG_FFRTMPHTTP_PROTOCOL)       += rtmphttp.o
  OBJS-$(CONFIG_FILE_PROTOCOL)             += file.o
@@@ -557,30 -409,18 +559,28 @@@ OBJS-$(CONFIG_SUBFILE_PROTOCOL
  OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
  OBJS-$(CONFIG_TLS_GNUTLS_PROTOCOL)       += tls_gnutls.o tls.o
  OBJS-$(CONFIG_TLS_OPENSSL_PROTOCOL)      += tls_openssl.o tls.o
 +OBJS-$(CONFIG_TLS_SCHANNEL_PROTOCOL)     += tls_schannel.o tls.o
 +OBJS-$(CONFIG_TLS_SECURETRANSPORT_PROTOCOL) += tls_securetransport.o tls.o
  OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 +OBJS-$(CONFIG_UDPLITE_PROTOCOL)          += udp.o
  OBJS-$(CONFIG_UNIX_PROTOCOL)             += unix.o
  
- OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
 +# libavdevice dependencies
 +OBJS-$(CONFIG_IEC61883_INDEV)            += dv.o
 +
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)             += avformatres.o
 +
  SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
  SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
  
  TESTPROGS = seek                                                        \
              url                                                         \
 +#           async                                                       \
  
+ TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh
  TESTPROGS-$(CONFIG_MOV_MUXER)            += movenc
  TESTPROGS-$(CONFIG_NETWORK)              += noproxy
- TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh
  TESTPROGS-$(CONFIG_SRTP)                 += srtp
  
  TOOLS     = aviocat                                                     \
@@@ -21,7 -15,7 +21,8 @@@ HEADERS = adler32.
            common.h                                                      \
            cpu.h                                                         \
            crc.h                                                         \
 +          des.h                                                         \
+           dict.h                                                        \
            display.h                                                     \
            downmix_info.h                                                \
            error.h                                                       \
            log.h                                                         \
            macros.h                                                      \
            mathematics.h                                                 \
 +          mastering_display_metadata.h                                  \
            md5.h                                                         \
            mem.h                                                         \
-           dict.h                                                        \
 +          motion_vector.h                                               \
 +          murmur3.h                                                     \
            opt.h                                                         \
            parseutils.h                                                  \
            pixdesc.h                                                     \
 +          pixelutils.h                                                  \
            pixfmt.h                                                      \
            random_seed.h                                                 \
-           replaygain.h                                                  \
 +          rc4.h                                                         \
            rational.h                                                    \
+           replaygain.h                                                  \
 +          ripemd.h                                                      \
            samplefmt.h                                                   \
            sha.h                                                         \
 +          sha512.h                                                      \
            stereo3d.h                                                    \
 +          threadmessage.h                                               \
            time.h                                                        \
 +          timecode.h                                                    \
 +          timestamp.h                                                   \
 +          tree.h                                                        \
 +          twofish.h                                                     \
            version.h                                                     \
            xtea.h                                                        \
 +          tea.h                                                         \
  
  HEADERS-$(CONFIG_LZO)                   += lzo.h
  
@@@ -121,39 -91,24 +122,38 @@@ OBJS = adler32.
         log.o                                                            \
         log2_tab.o                                                       \
         mathematics.o                                                    \
 +       mastering_display_metadata.o                                     \
         md5.o                                                            \
         mem.o                                                            \
-        dict.o                                                           \
 +       murmur3.o                                                        \
         opt.o                                                            \
         parseutils.o                                                     \
         pixdesc.o                                                        \
 +       pixelutils.o                                                     \
         random_seed.o                                                    \
         rational.o                                                       \
 +       reverse.o                                                        \
         rc4.o                                                            \
 +       ripemd.o                                                         \
         samplefmt.o                                                      \
         sha.o                                                            \
 +       sha512.o                                                         \
         stereo3d.o                                                       \
 +       threadmessage.o                                                  \
         time.o                                                           \
 +       timecode.o                                                       \
         tree.o                                                           \
 +       twofish.o                                                        \
         utils.o                                                          \
 +       xga_font_data.o                                                  \
         xtea.o                                                           \
 +       tea.o                                                            \
 +
 +OBJS-$(!HAVE_ATOMICS_NATIVE)            += atomic.o                     \
  
+ OBJS-$(CONFIG_CUDA)                     += hwcontext_cuda.o
  OBJS-$(CONFIG_LZO)                      += lzo.o
- OBJS-$(CONFIG_CUDA)                     += hwcontext_cuda.o
 +OBJS-$(CONFIG_OPENCL)                   += opencl.o opencl_internal.o
  OBJS-$(CONFIG_VAAPI)                    += hwcontext_vaapi.o
  OBJS-$(CONFIG_VDPAU)                    += hwcontext_vdpau.o
  
@@@ -5,25 -3,14 +5,25 @@@ NAME = swscal
  HEADERS = swscale.h                                                     \
            version.h                                                     \
  
 -OBJS = input.o                                                          \
 -       options.o                                                        \
 -       output.o                                                         \
 -       rgb2rgb.o                                                        \
 -       swscale.o                                                        \
 -       swscale_unscaled.o                                               \
 -       utils.o                                                          \
 -       yuv2rgb.o                                                        \
 +OBJS = alphablend.o                                     \
++       hscale.o                                         \
 +       hscale_fast_bilinear.o                           \
++       gamma.o                                          \
 +       input.o                                          \
 +       options.o                                        \
 +       output.o                                         \
 +       rgb2rgb.o                                        \
++       slice.o                                          \
 +       swscale.o                                        \
 +       swscale_unscaled.o                               \
 +       utils.o                                          \
 +       yuv2rgb.o                                        \
-        slice.o                                          \
-        hscale.o                                         \
 +       vscale.o                                         \
-        gamma.o                                          \
 +
 +OBJS-$(CONFIG_SHARED)        += log2_tab.o
 +
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o
  
  TESTPROGS = colorspace                                                  \
              swscale                                                     \
diff --cc tests/Makefile
@@@ -93,10 -56,9 +93,11 @@@ FILTERDEMDECENCMUX = $(call ALLYES, $(1
  
  PARSERDEMDEC       = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER)
  
 +include $(SRC_PATH)/$(APITESTSDIR)/Makefile
 +
  include $(SRC_PATH)/tests/fate/acodec.mak
  include $(SRC_PATH)/tests/fate/vcodec.mak
  include $(SRC_PATH)/tests/fate/avformat.mak
  include $(SRC_PATH)/tests/fate/seek.mak
  
@@@ -113,23 -74,15 +114,23 @@@ include $(SRC_PATH)/tests/fate/audio.ma
  include $(SRC_PATH)/tests/fate/bmp.mak
  include $(SRC_PATH)/tests/fate/cdxl.mak
  include $(SRC_PATH)/tests/fate/checkasm.mak
 +include $(SRC_PATH)/tests/fate/concatdec.mak
  include $(SRC_PATH)/tests/fate/cover-art.mak
 +include $(SRC_PATH)/tests/fate/dca.mak
  include $(SRC_PATH)/tests/fate/demux.mak
  include $(SRC_PATH)/tests/fate/dfa.mak
 +include $(SRC_PATH)/tests/fate/dnxhd.mak
  include $(SRC_PATH)/tests/fate/dpcm.mak
  include $(SRC_PATH)/tests/fate/ea.mak
 +include $(SRC_PATH)/tests/fate/exif.mak
 +include $(SRC_PATH)/tests/fate/ffmpeg.mak
 +include $(SRC_PATH)/tests/fate/ffprobe.mak
+ include $(SRC_PATH)/tests/fate/fft.mak
  include $(SRC_PATH)/tests/fate/filter-audio.mak
  include $(SRC_PATH)/tests/fate/filter-video.mak
  include $(SRC_PATH)/tests/fate/flac.mak
- include $(SRC_PATH)/tests/fate/fft.mak
 +include $(SRC_PATH)/tests/fate/gapless.mak
 +include $(SRC_PATH)/tests/fate/gif.mak
  include $(SRC_PATH)/tests/fate/h264.mak
  include $(SRC_PATH)/tests/fate/hevc.mak
  include $(SRC_PATH)/tests/fate/image.mak
@@@ -1,24 -1,16 +1,27 @@@
  # libavcodec tests
- AVCODECOBJS-$(CONFIG_ALAC_DECODER) += alacdsp.o
+ # subsystems
 -AVCODECOBJS-$(CONFIG_BSWAPDSP)          += bswapdsp.o
 -AVCODECOBJS-$(CONFIG_FMTCONVERT)        += fmtconvert.o
 -AVCODECOBJS-$(CONFIG_H264PRED)          += h264pred.o
 -AVCODECOBJS-$(CONFIG_H264QPEL)          += h264qpel.o
 +AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o
- AVCODECOBJS-$(CONFIG_DCA_DECODER) += synth_filter.o
 +AVCODECOBJS-$(CONFIG_FLACDSP)  += flacdsp.o
 +AVCODECOBJS-$(CONFIG_FMTCONVERT)   += fmtconvert.o
 +AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o
 +AVCODECOBJS-$(CONFIG_H264QPEL) += h264qpel.o
++AVCODECOBJS-$(CONFIG_VIDEODSP) += videodsp.o
+ # decoders/encoders
 -AVCODECOBJS-$(CONFIG_DCA_DECODER)       += dcadsp.o synth_filter.o
 -AVCODECOBJS-$(CONFIG_HEVC_DECODER)      += hevc_mc.o
 -AVCODECOBJS-$(CONFIG_V210_ENCODER)      += v210enc.o
++AVCODECOBJS-$(CONFIG_ALAC_DECODER) += alacdsp.o
++AVCODECOBJS-$(CONFIG_DCA_DECODER) += synth_filter.o
 +AVCODECOBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dsp.o
 +AVCODECOBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o
 +AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o
 +AVCODECOBJS-$(CONFIG_VP9_DECODER) += vp9dsp.o
- AVCODECOBJS-$(CONFIG_VIDEODSP) += videodsp.o
  
 -CHECKASMOBJS-$(CONFIG_AVCODEC)          += $(AVCODECOBJS-yes)
 +CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes)
 +
 +# libavfilter tests
 +AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o
 +AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o
 +
 +CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
  
  
  -include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
Simple merge
Simple merge
@@@ -58,104 -48,99 +58,104 @@@ fate-seek-acodec-pcm-u8:        SRC = f
  
  FATE_SEEK += $(FATE_SEEK_ACODEC-yes:%=fate-seek-acodec-%)
  
 -# files from fate-vsynth2
 -
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, ASV1,          AVI)     += asv1
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, ASV2,          AVI)     += asv2
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p-rd
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         MOV)     += dnxhd-1080i
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv-411
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv-50
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, FFV1,          AVI)     += ffv1
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, FLASHSV,       FLV)     += flashsv
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, FLV,           FLV)     += flv
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, H261,          AVI)     += h261
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, H263,          AVI)     += h263
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, H263,          AVI)     += h263p
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, HUFFYUV,       AVI)     += huffyuv
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, JPEGLS,        AVI)     += jpegls
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, LJPEG MJPEG,   AVI)     += ljpeg
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, MJPEG,         AVI)     += mjpeg
 -
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) +=    \
 -                                                    mpeg1                \
 +# files from fate-vsynth_lena
 +
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV1,          AVI)     += asv1
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV2,          AVI)     += asv2
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p-rd
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD,         MOV)     += dnxhd-1080i
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO,       DV)      += dv
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO,       DV)      += dv-411
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO,       DV)      += dv-50
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FFV1,          AVI)     += ffv1
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FLASHSV,       FLV)     += flashsv
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FLV,           FLV)     += flv
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H261,          AVI)     += h261
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H263,          AVI)     += h263
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H263,          AVI)     += h263p
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, HUFFYUV,       AVI)     += huffyuv
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, JPEGLS,        AVI)     += jpegls
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG,   AVI)     += ljpeg
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG,         AVI)     += mjpeg
 +
- FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) +=          \
-                                                     mpeg1                      \
++FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) +=    \
++                                                    mpeg1                    \
                                                      mpeg1b
  
- FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) +=          \
-                                                     mpeg2-422                  \
-                                                     mpeg2-idct-int             \
-                                                     mpeg2-ilace                \
-                                                     mpeg2-ivlc-qprd            \
-                                                     mpeg2-thread               \
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) +=    \
 -                                                    mpeg2-422            \
 -                                                    mpeg2-idct-int       \
 -                                                    mpeg2-ilace          \
 -                                                    mpeg2-ivlc-qprd      \
 -                                                    mpeg2-thread         \
++FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) +=    \
++                                                    mpeg2-422                \
++                                                    mpeg2-idct-int           \
++                                                    mpeg2-ilace              \
++                                                    mpeg2-ivlc-qprd          \
++                                                    mpeg2-thread             \
                                                      mpeg2-thread-ivlc
  
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG4,         MP4 MOV) += mpeg4
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG4, AVI)             += $(FATE_MPEG4_AVI)
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, MSMPEG4V3,     AVI)     += msmpeg4
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, MSMPEG4V2,     AVI)     += msmpeg4v2
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, RAWVIDEO,      AVI)     += rgb
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, ROQ,           ROQ)     += roqvideo
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, RV10,          RM)      += rv10
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, RV20,          RM)      += rv20
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, SVQ1,          MOV)     += svq1
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, WMV1,          AVI)     += wmv1
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, WMV2,          AVI)     += wmv2
 -FATE_SEEK_VSYNTH2-$(call ENCDEC, RAWVIDEO,      AVI)     += yuv
 -
 -fate-seek-vsynth2-asv1:              SRC = fate/vsynth2-asv1.avi
 -fate-seek-vsynth2-asv2:              SRC = fate/vsynth2-asv2.avi
 -fate-seek-vsynth2-dnxhd-1080i:       SRC = fate/vsynth2-dnxhd-1080i.mov
 -fate-seek-vsynth2-dnxhd-720p:        SRC = fate/vsynth2-dnxhd-720p.dnxhd
 -fate-seek-vsynth2-dnxhd-720p-rd:     SRC = fate/vsynth2-dnxhd-720p.dnxhd
 -fate-seek-vsynth2-dv:                SRC = fate/vsynth2-dv.dv
 -fate-seek-vsynth2-dv-411:            SRC = fate/vsynth2-dv-411.dv
 -fate-seek-vsynth2-dv-50:             SRC = fate/vsynth2-dv-50.dv
 -fate-seek-vsynth2-ffv1:              SRC = fate/vsynth2-ffv1.avi
 -fate-seek-vsynth2-flashsv:           SRC = fate/vsynth2-flashsv.flv
 -fate-seek-vsynth2-flv:               SRC = fate/vsynth2-flv.flv
 -fate-seek-vsynth2-h261:              SRC = fate/vsynth2-h261.avi
 -fate-seek-vsynth2-h263:              SRC = fate/vsynth2-h263.avi
 -fate-seek-vsynth2-h263p:             SRC = fate/vsynth2-h263p.avi
 -fate-seek-vsynth2-huffyuv:           SRC = fate/vsynth2-huffyuv.avi
 -fate-seek-vsynth2-jpegls:            SRC = fate/vsynth2-jpegls.avi
 -fate-seek-vsynth2-ljpeg:             SRC = fate/vsynth2-ljpeg.avi
 -fate-seek-vsynth2-mjpeg:             SRC = fate/vsynth2-mjpeg.avi
 -fate-seek-vsynth2-mpeg1:             SRC = fate/vsynth2-mpeg1.mpeg1video
 -fate-seek-vsynth2-mpeg1b:            SRC = fate/vsynth2-mpeg1b.mpeg1video
 -fate-seek-vsynth2-mpeg2-422:         SRC = fate/vsynth2-mpeg2-422.mpeg2video
 -fate-seek-vsynth2-mpeg2-idct-int:    SRC = fate/vsynth2-mpeg2-idct-int.mpeg2video
 -fate-seek-vsynth2-mpeg2-ilace:       SRC = fate/vsynth2-mpeg2-ilace.mpeg2video
 -fate-seek-vsynth2-mpeg2-ivlc-qprd:   SRC = fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
 -fate-seek-vsynth2-mpeg2-thread:      SRC = fate/vsynth2-mpeg2-thread.mpeg2video
 -fate-seek-vsynth2-mpeg2-thread-ivlc: SRC = fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
 -fate-seek-vsynth2-mpeg4:             SRC = fate/vsynth2-mpeg4.mp4
 -fate-seek-vsynth2-mpeg4-adap:        SRC = fate/vsynth2-mpeg4-adap.avi
 -fate-seek-vsynth2-mpeg4-adv:         SRC = fate/vsynth2-mpeg4-adv.avi
 -fate-seek-vsynth2-mpeg4-error:       SRC = fate/vsynth2-mpeg4-error.avi
 -fate-seek-vsynth2-mpeg4-nr:          SRC = fate/vsynth2-mpeg4-nr.avi
 -fate-seek-vsynth2-mpeg4-qpel:        SRC = fate/vsynth2-mpeg4-qpel.avi
 -fate-seek-vsynth2-mpeg4-qprd:        SRC = fate/vsynth2-mpeg4-qprd.avi
 -fate-seek-vsynth2-mpeg4-rc:          SRC = fate/vsynth2-mpeg4-rc.avi
 -fate-seek-vsynth2-mpeg4-thread:      SRC = fate/vsynth2-mpeg4-thread.avi
 -fate-seek-vsynth2-msmpeg4:           SRC = fate/vsynth2-msmpeg4.avi
 -fate-seek-vsynth2-msmpeg4v2:         SRC = fate/vsynth2-msmpeg4v2.avi
 -fate-seek-vsynth2-rgb:               SRC = fate/vsynth2-rgb.avi
 -fate-seek-vsynth2-roqvideo:          SRC = fate/vsynth2-roqvideo.roq
 -fate-seek-vsynth2-rv10:              SRC = fate/vsynth2-rv10.rm
 -fate-seek-vsynth2-rv20:              SRC = fate/vsynth2-rv20.rm
 -fate-seek-vsynth2-svq1:              SRC = fate/vsynth2-svq1.mov
 -fate-seek-vsynth2-wmv1:              SRC = fate/vsynth2-wmv1.avi
 -fate-seek-vsynth2-wmv2:              SRC = fate/vsynth2-wmv2.avi
 -fate-seek-vsynth2-yuv:               SRC = fate/vsynth2-yuv.avi
 -
 -FATE_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%)
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4,         MP4 MOV) += mpeg4
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, AVI)             += $(FATE_MPEG4_AVI)
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V3,     AVI)     += msmpeg4
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V2,     AVI)     += msmpeg4v2
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO,      AVI)     += rgb
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ROQ,           ROQ)     += roqvideo
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV10,          RM)      += rv10
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV20,          RM)      += rv20
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW,          AVI)     += snow
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW,          AVI)     += snow-ll
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SVQ1,          MOV)     += svq1
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV1,          AVI)     += wmv1
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV2,          AVI)     += wmv2
 +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO,      AVI)     += yuv
 +
 +fate-seek-vsynth_lena-asv1:              SRC = fate/vsynth_lena-asv1.avi
 +fate-seek-vsynth_lena-asv2:              SRC = fate/vsynth_lena-asv2.avi
 +fate-seek-vsynth_lena-dnxhd-1080i:       SRC = fate/vsynth_lena-dnxhd-1080i.mov
 +fate-seek-vsynth_lena-dnxhd-720p:        SRC = fate/vsynth_lena-dnxhd-720p.dnxhd
 +fate-seek-vsynth_lena-dnxhd-720p-rd:     SRC = fate/vsynth_lena-dnxhd-720p.dnxhd
 +fate-seek-vsynth_lena-dv:                SRC = fate/vsynth_lena-dv.dv
 +fate-seek-vsynth_lena-dv-411:            SRC = fate/vsynth_lena-dv-411.dv
 +fate-seek-vsynth_lena-dv-50:             SRC = fate/vsynth_lena-dv-50.dv
 +fate-seek-vsynth_lena-ffv1:              SRC = fate/vsynth_lena-ffv1.avi
 +fate-seek-vsynth_lena-flashsv:           SRC = fate/vsynth_lena-flashsv.flv
 +fate-seek-vsynth_lena-flv:               SRC = fate/vsynth_lena-flv.flv
 +fate-seek-vsynth_lena-h261:              SRC = fate/vsynth_lena-h261.avi
 +fate-seek-vsynth_lena-h263:              SRC = fate/vsynth_lena-h263.avi
 +fate-seek-vsynth_lena-h263p:             SRC = fate/vsynth_lena-h263p.avi
 +fate-seek-vsynth_lena-huffyuv:           SRC = fate/vsynth_lena-huffyuv.avi
 +fate-seek-vsynth_lena-jpegls:            SRC = fate/vsynth_lena-jpegls.avi
 +fate-seek-vsynth_lena-ljpeg:             SRC = fate/vsynth_lena-ljpeg.avi
 +fate-seek-vsynth_lena-mjpeg:             SRC = fate/vsynth_lena-mjpeg.avi
 +fate-seek-vsynth_lena-mpeg1:             SRC = fate/vsynth_lena-mpeg1.mpeg1video
 +fate-seek-vsynth_lena-mpeg1b:            SRC = fate/vsynth_lena-mpeg1b.mpeg1video
 +fate-seek-vsynth_lena-mpeg2-422:         SRC = fate/vsynth_lena-mpeg2-422.mpeg2video
 +fate-seek-vsynth_lena-mpeg2-idct-int:    SRC = fate/vsynth_lena-mpeg2-idct-int.mpeg2video
 +fate-seek-vsynth_lena-mpeg2-ilace:       SRC = fate/vsynth_lena-mpeg2-ilace.mpeg2video
 +fate-seek-vsynth_lena-mpeg2-ivlc-qprd:   SRC = fate/vsynth_lena-mpeg2-ivlc-qprd.mpeg2video
 +fate-seek-vsynth_lena-mpeg2-thread:      SRC = fate/vsynth_lena-mpeg2-thread.mpeg2video
 +fate-seek-vsynth_lena-mpeg2-thread-ivlc: SRC = fate/vsynth_lena-mpeg2-thread-ivlc.mpeg2video
 +fate-seek-vsynth_lena-mpeg4:             SRC = fate/vsynth_lena-mpeg4.mp4
 +fate-seek-vsynth_lena-mpeg4-adap:        SRC = fate/vsynth_lena-mpeg4-adap.avi
 +fate-seek-vsynth_lena-mpeg4-adv:         SRC = fate/vsynth_lena-mpeg4-adv.avi
 +fate-seek-vsynth_lena-mpeg4-error:       SRC = fate/vsynth_lena-mpeg4-error.avi
 +fate-seek-vsynth_lena-mpeg4-nr:          SRC = fate/vsynth_lena-mpeg4-nr.avi
 +fate-seek-vsynth_lena-mpeg4-nsse:        SRC = fate/vsynth_lena-mpeg4-nsse.avi
 +fate-seek-vsynth_lena-mpeg4-qpel:        SRC = fate/vsynth_lena-mpeg4-qpel.avi
 +fate-seek-vsynth_lena-mpeg4-qprd:        SRC = fate/vsynth_lena-mpeg4-qprd.avi
 +fate-seek-vsynth_lena-mpeg4-rc:          SRC = fate/vsynth_lena-mpeg4-rc.avi
 +fate-seek-vsynth_lena-mpeg4-thread:      SRC = fate/vsynth_lena-mpeg4-thread.avi
 +fate-seek-vsynth_lena-msmpeg4:           SRC = fate/vsynth_lena-msmpeg4.avi
 +fate-seek-vsynth_lena-msmpeg4v2:         SRC = fate/vsynth_lena-msmpeg4v2.avi
 +fate-seek-vsynth_lena-rgb:               SRC = fate/vsynth_lena-rgb.avi
 +fate-seek-vsynth_lena-roqvideo:          SRC = fate/vsynth_lena-roqvideo.roq
 +fate-seek-vsynth_lena-rv10:              SRC = fate/vsynth_lena-rv10.rm
 +fate-seek-vsynth_lena-rv20:              SRC = fate/vsynth_lena-rv20.rm
 +fate-seek-vsynth_lena-snow:              SRC = fate/vsynth_lena-snow.avi
 +fate-seek-vsynth_lena-snow-ll:           SRC = fate/vsynth_lena-snow-ll.avi
 +fate-seek-vsynth_lena-svq1:              SRC = fate/vsynth_lena-svq1.mov
 +fate-seek-vsynth_lena-wmv1:              SRC = fate/vsynth_lena-wmv1.avi
 +fate-seek-vsynth_lena-wmv2:              SRC = fate/vsynth_lena-wmv2.avi
 +fate-seek-vsynth_lena-yuv:               SRC = fate/vsynth_lena-yuv.avi
 +
 +FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%)
  
  # files from fate-lavf