Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 20:45:34 +0000 (22:45 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 20:45:34 +0000 (22:45 +0200)
* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
  configure: Factor out vp8dsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/ppc/Makefile
libavcodec/x86/Makefile

diff --cc configure
+++ b/configure
@@@ -2338,11 -1984,10 +2339,11 @@@ vp5_decoder_select="h264chroma hpeldsp 
  vp6_decoder_select="h264chroma hpeldsp huffman videodsp vp3dsp vp56dsp"
  vp6a_decoder_select="vp6_decoder"
  vp6f_decoder_select="vp6_decoder"
- vp7_decoder_select="h264pred videodsp"
- vp8_decoder_select="h264pred videodsp"
+ vp7_decoder_select="h264pred videodsp vp8dsp"
+ vp8_decoder_select="h264pred videodsp vp8dsp"
 -vp9_decoder_select="videodsp"
 +vp9_decoder_select="videodsp vp9_parser"
  webp_decoder_select="vp8_decoder"
 +wmalossless_decoder_select="llauddsp"
  wmapro_decoder_select="mdct sinewin wma_freqs"
  wmav1_decoder_select="mdct sinewin wma_freqs"
  wmav1_encoder_select="mdct sinewin wma_freqs"
@@@ -529,18 -442,13 +530,18 @@@ OBJS-$(CONFIG_VP3_DECODER)             
  OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o vp56rac.o
  OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o \
                                            vp6dsp.o vp56rac.o
- OBJS-$(CONFIG_VP7_DECODER)             += vp8.o vp8dsp.o vp56rac.o
- OBJS-$(CONFIG_VP8_DECODER)             += vp8.o vp8dsp.o vp56rac.o
+ OBJS-$(CONFIG_VP7_DECODER)             += vp8.o vp56rac.o
+ OBJS-$(CONFIG_VP8_DECODER)             += vp8.o vp56rac.o
 -OBJS-$(CONFIG_VP9_DECODER)             += vp9.o vp9data.o vp9dsp.o \
 -                                          vp9block.o vp9prob.o vp9mvs.o vp56rac.o
 +OBJS-$(CONFIG_VP9_DECODER)             += vp9.o vp9dsp.o vp56rac.o vp9dsp_8bpp.o \
 +                                          vp9dsp_10bpp.o vp9dsp_12bpp.o
 +OBJS-$(CONFIG_VPLAYER_DECODER)         += textdec.o ass.o
  OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
  OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
 -OBJS-$(CONFIG_WEBP_DECODER)            += webp.o
 +OBJS-$(CONFIG_WAVPACK_ENCODER)         += wavpackenc.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += vp8.o vp8dsp.o vp56rac.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += webp.o exif.o tiff_common.o
 +OBJS-$(CONFIG_WEBVTT_DECODER)          += webvttdec.o ass.o
 +OBJS-$(CONFIG_WEBVTT_ENCODER)          += webvttenc.o ass_split.o
  OBJS-$(CONFIG_WMALOSSLESS_DECODER)     += wmalosslessdec.o wma_common.o
  OBJS-$(CONFIG_WMAPRO_DECODER)          += wmaprodec.o wma.o wma_common.o
  OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o wma.o wma_common.o aactab.o
Simple merge
@@@ -20,9 -19,10 +20,10 @@@ OBJS-$(CONFIG_MPEGVIDEOENC)            
  OBJS-$(CONFIG_PIXBLOCKDSP)             += ppc/pixblockdsp.o
  OBJS-$(CONFIG_VIDEODSP)                += ppc/videodsp_ppc.o
  OBJS-$(CONFIG_VP3DSP)                  += ppc/vp3dsp_altivec.o
+ OBJS-$(CONFIG_VP8DSP)                  += ppc/vp8dsp_altivec.o
  
  # decoders/encoders
 -OBJS-$(CONFIG_APE_DECODER)             += ppc/apedsp_altivec.o
 +OBJS-$(CONFIG_LLAUDDSP)                += ppc/lossless_audiodsp_altivec.o
  OBJS-$(CONFIG_SVQ1_ENCODER)            += ppc/svq1enc_altivec.o
  OBJS-$(CONFIG_VC1_DECODER)             += ppc/vc1dsp_altivec.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += ppc/vorbisdsp_altivec.o
@@@ -60,10 -51,7 +61,8 @@@ OBJS-$(CONFIG_V210_ENCODER)            
  OBJS-$(CONFIG_VC1_DECODER)             += x86/vc1dsp_init.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += x86/vorbisdsp_init.o
  OBJS-$(CONFIG_VP6_DECODER)             += x86/vp6dsp_init.o
- OBJS-$(CONFIG_VP7_DECODER)             += x86/vp8dsp_init.o
- OBJS-$(CONFIG_VP8_DECODER)             += x86/vp8dsp_init.o
  OBJS-$(CONFIG_VP9_DECODER)             += x86/vp9dsp_init.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += x86/vp8dsp_init.o
  
  
  # GCC inline assembly optimizations
@@@ -125,8 -107,11 +124,10 @@@ YASM-OBJS-$(CONFIG_QPELDSP)            
                                            x86/fpel.o                    \
                                            x86/qpel.o
  YASM-OBJS-$(CONFIG_RV34DSP)            += x86/rv34dsp.o
 -YASM-OBJS-$(CONFIG_V210_ENCODER)       += x86/v210enc.o
  YASM-OBJS-$(CONFIG_VIDEODSP)           += x86/videodsp.o
  YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
+ YASM-OBJS-$(CONFIG_VP8DSP)             += x86/vp8dsp.o                  \
+                                           x86/vp8dsp_loopfilter.o
  
  # decoders/encoders
  YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
@@@ -154,12 -124,4 +155,8 @@@ YASM-OBJS-$(CONFIG_V210_DECODER)       
  YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp.o
  YASM-OBJS-$(CONFIG_VORBIS_DECODER)     += x86/vorbisdsp.o
  YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp6dsp.o
- YASM-OBJS-$(CONFIG_VP7_DECODER)        += x86/vp8dsp.o                  \
-                                           x86/vp8dsp_loopfilter.o
- YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o                  \
-                                           x86/vp8dsp_loopfilter.o
 -YASM-OBJS-$(CONFIG_VP9_DECODER)        += x86/vp9dsp.o
 +YASM-OBJS-$(CONFIG_VP9_DECODER)        += x86/vp9intrapred.o            \
 +                                          x86/vp9itxfm.o                \
 +                                          x86/vp9lpf.o                  \
 +                                          x86/vp9mc.o
 +YASM-OBJS-$(CONFIG_WEBP_DECODER)       += x86/vp8dsp.o