]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 20:21:36 +0000 (22:21 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 20:21:36 +0000 (22:21 +0200)
* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418':
  configure: Factor out rv34dsp module

Conflicts:
libavcodec/Makefile
libavcodec/x86/Makefile

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

diff --cc configure
index ff9c31633fa7990b0b8a97be21b0b480e080969f,aa9665afa217e52bc0a6d8e4d66dd53c4f61ac0e..ef9f2137be278c0f3cf75bce1dcdb7adc85409ad
+++ b/configure
@@@ -2298,15 -1948,10 +2299,15 @@@ rv10_decoder_select="error_resilience h
  rv10_encoder_select="h263_encoder"
  rv20_decoder_select="error_resilience h263_decoder h263dsp mpeg_er"
  rv20_encoder_select="h263_encoder"
- rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo videodsp"
- rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo videodsp"
+ rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo rv34dsp videodsp"
+ rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpeg_er mpegvideo rv34dsp videodsp"
  shorten_decoder_select="golomb"
  sipr_decoder_select="lsp"
 +snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp"
 +snow_encoder_select="aandcttables dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder"
 +sonic_decoder_select="golomb rangecoder"
 +sonic_encoder_select="golomb rangecoder"
 +sonic_ls_encoder_select="golomb rangecoder"
  sp5x_decoder_select="mjpeg_decoder"
  svq1_decoder_select="hpeldsp"
  svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc"
index bfad846791271ed7c9a1fddb67c8083d11392089,0d0f0de0219574da2e7122eddec4e7a6f5dc142b..c40f09f7f28cf909fd58816b52deb7bfd06ba5a2
@@@ -104,8 -93,8 +104,9 @@@ OBJS-$(CONFIG_QSVENC)                  
  OBJS-$(CONFIG_RANGECODER)              += rangecoder.o
  RDFT-OBJS-$(CONFIG_HARDCODED_TABLES)   += sin_tables.o
  OBJS-$(CONFIG_RDFT)                    += rdft.o $(RDFT-OBJS-yes)
 -OBJS-$(CONFIG_SINEWIN)                 += sinewin.o
+ OBJS-$(CONFIG_RV34DSP)                 += rv34dsp.o
 +OBJS-$(CONFIG_SHARED)                  += log2_tab.o
 +OBJS-$(CONFIG_SINEWIN)                 += sinewin.o sinewin_fixed.o
  OBJS-$(CONFIG_SNAPPY)                  += snappy.o
  OBJS-$(CONFIG_STARTCODE)               += startcode.o
  OBJS-$(CONFIG_TEXTUREDSP)              += texturedsp.o
@@@ -437,11 -374,9 +438,11 @@@ OBJS-$(CONFIG_RV10_DECODER)            
  OBJS-$(CONFIG_RV10_ENCODER)            += rv10enc.o
  OBJS-$(CONFIG_RV20_DECODER)            += rv10.o
  OBJS-$(CONFIG_RV20_ENCODER)            += rv20enc.o
- OBJS-$(CONFIG_RV30_DECODER)            += rv30.o rv34.o rv30dsp.o rv34dsp.o
- OBJS-$(CONFIG_RV40_DECODER)            += rv40.o rv34.o rv34dsp.o rv40dsp.o
+ OBJS-$(CONFIG_RV30_DECODER)            += rv30.o rv34.o rv30dsp.o
+ OBJS-$(CONFIG_RV40_DECODER)            += rv40.o rv34.o rv40dsp.o
 +OBJS-$(CONFIG_SAMI_DECODER)            += samidec.o ass.o
  OBJS-$(CONFIG_S302M_DECODER)           += s302m.o
 +OBJS-$(CONFIG_S302M_ENCODER)           += s302menc.o
  OBJS-$(CONFIG_SANM_DECODER)            += sanm.o
  OBJS-$(CONFIG_SGI_DECODER)             += sgidec.o
  OBJS-$(CONFIG_SGI_ENCODER)             += sgienc.o rle.o
index ede59a1462e40a160334dd43972d55703bc711dd,a9d1e02db4ae3d087eb95f925832de359f1e6b78..f52403d2ef30cde24f6f32b5c294c1b49620fe3a
@@@ -33,11 -33,12 +34,12 @@@ OBJS-$(CONFIG_VP3DSP)                  
  # decoders/encoders
  OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
                                            arm/sbrdsp_init_arm.o
 -OBJS-$(CONFIG_APE_DECODER)             += arm/apedsp_init_arm.o
 -OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o
  OBJS-$(CONFIG_ADPCM_G722_DECODER)      += arm/g722dsp_init_arm.o
  OBJS-$(CONFIG_ADPCM_G722_ENCODER)      += arm/g722dsp_init_arm.o
 +OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o
 +OBJS-$(CONFIG_HEVC_DECODER)            += arm/hevcdsp_init_arm.o
  OBJS-$(CONFIG_MLP_DECODER)             += arm/mlpdsp_init_arm.o
+ OBJS-$(CONFIG_RV40_DECODER)            += arm/rv40dsp_init_arm.o
  OBJS-$(CONFIG_VC1_DECODER)             += arm/vc1dsp_init_arm.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += arm/vorbisdsp_init_arm.o
  OBJS-$(CONFIG_VP6_DECODER)             += arm/vp6dsp_init_arm.o
index 08cee1c4fdf41562c7725446bebcf9b41a362495,aa633b153788c00e005fe0500feec8cf6b156499..ee021353849ed73208d3ca802c0ce969e7954c66
@@@ -49,14 -43,9 +50,12 @@@ OBJS-$(CONFIG_MLP_DECODER)             
  OBJS-$(CONFIG_MPEG4_DECODER)           += x86/xvididct_init.o
  OBJS-$(CONFIG_PNG_DECODER)             += x86/pngdsp_init.o
  OBJS-$(CONFIG_PRORES_DECODER)          += x86/proresdsp_init.o
- OBJS-$(CONFIG_RV30_DECODER)            += x86/rv34dsp_init.o
- OBJS-$(CONFIG_RV40_DECODER)            += x86/rv34dsp_init.o            \
-                                           x86/rv40dsp_init.o
 +OBJS-$(CONFIG_PRORES_LGPL_DECODER)     += x86/proresdsp_init.o
 -OBJS-$(CONFIG_SVQ1_ENCODER)            += x86/svq1enc.o
 -OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp.o
+ OBJS-$(CONFIG_RV40_DECODER)            += x86/rv40dsp_init.o
 +OBJS-$(CONFIG_SVQ1_ENCODER)            += x86/svq1enc_init.o
 +OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp_init.o
 +OBJS-$(CONFIG_TTA_DECODER)             += x86/ttadsp_init.o
 +OBJS-$(CONFIG_V210_DECODER)            += x86/v210-init.o
  OBJS-$(CONFIG_V210_ENCODER)            += x86/v210enc_init.o
  OBJS-$(CONFIG_VC1_DECODER)             += x86/vc1dsp_init.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += x86/vorbisdsp_init.o
@@@ -125,34 -107,19 +124,33 @@@ YASM-OBJS-$(CONFIG_PIXBLOCKDSP)        
  YASM-OBJS-$(CONFIG_QPELDSP)            += x86/qpeldsp.o                 \
                                            x86/fpel.o                    \
                                            x86/qpel.o
 -YASM-OBJS-$(CONFIG_V210_ENCODER)       += x86/v210enc.o
+ YASM-OBJS-$(CONFIG_RV34DSP)            += x86/rv34dsp.o
  YASM-OBJS-$(CONFIG_VIDEODSP)           += x86/videodsp.o
  YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
  
  # decoders/encoders
  YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
 -YASM-OBJS-$(CONFIG_APE_DECODER)        += x86/apedsp.o
 +YASM-OBJS-$(CONFIG_ADPCM_G722_DECODER) += x86/g722dsp.o
 +YASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += x86/g722dsp.o
 +YASM-OBJS-$(CONFIG_APNG_DECODER)       += x86/pngdsp.o
  YASM-OBJS-$(CONFIG_DCA_DECODER)        += x86/dcadsp.o
 -YASM-OBJS-$(CONFIG_HEVC_DECODER)       += x86/hevc_deblock.o
 +YASM-OBJS-$(CONFIG_HEVC_DECODER)       += x86/hevc_mc.o                 \
 +                                          x86/hevc_deblock.o            \
 +                                          x86/hevc_idct.o               \
 +                                          x86/hevc_res_add.o            \
 +                                          x86/hevc_sao.o
 +YASM-OBJS-$(CONFIG_JPEG2000_DECODER)   += x86/jpeg2000dsp.o
 +YASM-OBJS-$(CONFIG_MLP_DECODER)        += x86/mlpdsp.o
 +YASM-OBJS-$(CONFIG_MPEG4_DECODER)      += x86/xvididct.o
  YASM-OBJS-$(CONFIG_PNG_DECODER)        += x86/pngdsp.o
  YASM-OBJS-$(CONFIG_PRORES_DECODER)     += x86/proresdsp.o
- YASM-OBJS-$(CONFIG_RV30_DECODER)       += x86/rv34dsp.o
- YASM-OBJS-$(CONFIG_RV40_DECODER)       += x86/rv34dsp.o                 \
-                                           x86/rv40dsp.o
 +YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
+ YASM-OBJS-$(CONFIG_RV40_DECODER)       += x86/rv40dsp.o
 +YASM-OBJS-$(CONFIG_SVQ1_ENCODER)       += x86/svq1enc.o
 +YASM-OBJS-$(CONFIG_TRUEHD_DECODER)     += x86/mlpdsp.o
 +YASM-OBJS-$(CONFIG_TTA_DECODER)        += x86/ttadsp.o
 +YASM-OBJS-$(CONFIG_V210_ENCODER)       += x86/v210enc.o
 +YASM-OBJS-$(CONFIG_V210_DECODER)       += x86/v210.o
  YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp.o
  YASM-OBJS-$(CONFIG_VORBIS_DECODER)     += x86/vorbisdsp.o
  YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp6dsp.o