[FFmpeg-cvslog] Merge commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr 13 18:14:04 2017 -0300| [40f3f0298a01c576d4651b4d166f7461dd018a2c] | committer: James Almer

Merge commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'

* commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a':
  build: Drop stray golomb dependencies

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40f3f0298a01c576d4651b4d166f7461dd018a2c
---

 configure | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 1c0962be6d..ba167b4a5f 100755
--- a/configure
+++ b/configure
@@ -2414,13 +2414,13 @@ eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp mpegvideo"
 eatgq_decoder_select="aandcttables"
 eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp"
 exr_decoder_select="zlib"
-ffv1_decoder_select="golomb rangecoder"
+ffv1_decoder_select="rangecoder"
 ffv1_encoder_select="rangecoder"
 ffvhuff_decoder_select="huffyuv_decoder"
 ffvhuff_encoder_select="huffyuv_encoder"
 fic_decoder_select="golomb"
-flac_decoder_select="flacdsp golomb"
-flac_encoder_select="bswapdsp flacdsp golomb lpc"
+flac_decoder_select="flacdsp"
+flac_encoder_select="bswapdsp flacdsp lpc"
 flashsv2_decoder_select="zlib"
 flashsv2_encoder_select="zlib"
 flashsv_decoder_select="zlib"
@@ -2452,12 +2452,10 @@ indeo3_decoder_select="hpeldsp"
 indeo4_decoder_select="ividsp"
 indeo5_decoder_select="ividsp"
 interplay_video_decoder_select="hpeldsp"
-jpegls_decoder_select="golomb mjpeg_decoder"
-jpegls_encoder_select="golomb"
+jpegls_decoder_select="mjpeg_decoder"
 jv_decoder_select="blockdsp"
 lagarith_decoder_select="llviddsp"
 ljpeg_encoder_select="aandcttables idctdsp jpegtables mpegvideoenc"
-loco_decoder_select="golomb"
 magicyuv_decoder_select="llviddsp"
 mdec_decoder_select="blockdsp idctdsp mpegvideo"
 metasound_decoder_select="lsp mdct sinewin"
@@ -2523,7 +2521,7 @@ rv20_encoder_select="h263_encoder"
 rv30_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp"
 rv40_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp"
 screenpresso_decoder_select="zlib"
-shorten_decoder_select="golomb bswapdsp"
+shorten_decoder_select="bswapdsp"
 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"


======================================================================

diff --cc configure
index 1c0962be6d,c755aabb2d..ba167b4a5f
--- a/configure
+++ b/configure
@@@ -2411,20 -1968,19 +2411,20 @@@ dxv_decoder_select="lzf texturedsp
  eac3_decoder_select="ac3_decoder"
  eac3_encoder_select="ac3_encoder"
  eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp mpegvideo"
 -eatgq_decoder_select="aandcttables idctdsp"
 +eatgq_decoder_select="aandcttables"
  eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp"
 -exr_decoder_deps="zlib"
 +exr_decoder_select="zlib"
- ffv1_decoder_select="golomb rangecoder"
+ ffv1_decoder_select="rangecoder"
  ffv1_encoder_select="rangecoder"
  ffvhuff_decoder_select="huffyuv_decoder"
  ffvhuff_encoder_select="huffyuv_encoder"
  fic_decoder_select="golomb"
- flac_decoder_select="flacdsp golomb"
- flac_encoder_select="bswapdsp flacdsp golomb lpc"
+ flac_decoder_select="flacdsp"
+ flac_encoder_select="bswapdsp flacdsp lpc"
 -flashsv_decoder_deps="zlib"
 -flashsv_encoder_deps="zlib"
 -flashsv2_decoder_deps="zlib"
 +flashsv2_decoder_select="zlib"
 +flashsv2_encoder_select="zlib"
 +flashsv_decoder_select="zlib"
 +flashsv_encoder_select="zlib"
  flv_decoder_select="h263_decoder"
  flv_encoder_select="h263_encoder"
  fourxm_decoder_select="blockdsp bswapdsp"
@@@ -2452,13 -2007,11 +2452,11 @@@ indeo3_decoder_select="hpeldsp
  indeo4_decoder_select="ividsp"
  indeo5_decoder_select="ividsp"
  interplay_video_decoder_select="hpeldsp"
- jpegls_decoder_select="golomb mjpeg_decoder"
- jpegls_encoder_select="golomb"
+ jpegls_decoder_select="mjpeg_decoder"
  jv_decoder_select="blockdsp"
 -lagarith_decoder_select="huffyuvdsp"
 -ljpeg_encoder_select="aandcttables idctdsp jpegtables"
 -magicyuv_decoder_select="huffyuvdsp"
 +lagarith_decoder_select="llviddsp"
 +ljpeg_encoder_select="aandcttables idctdsp jpegtables mpegvideoenc"
- loco_decoder_select="golomb"
 +magicyuv_decoder_select="llviddsp"
  mdec_decoder_select="blockdsp idctdsp mpegvideo"
  metasound_decoder_select="lsp mdct sinewin"
  mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
@@@ -2510,26 -2062,17 +2508,26 @@@ prores_decoder_select="blockdsp idctdsp
  prores_encoder_select="fdctdsp"
  qcelp_decoder_select="lsp"
  qdm2_decoder_select="mdct rdft mpegaudiodsp"
 -ra_144_encoder_select="audio_frame_queue lpc"
 +ra_144_decoder_select="audiodsp"
 +ra_144_encoder_select="audio_frame_queue lpc audiodsp"
  ralf_decoder_select="golomb"
 -rscc_decoder_deps="zlib"
 -rv10_decoder_select="error_resilience h263_decoder h263dsp mpeg_er"
 +rawvideo_decoder_select="bswapdsp"
 +rscc_decoder_select="zlib"
 +rtjpeg_decoder_select="me_cmp"
 +rv10_decoder_select="h263_decoder"
  rv10_encoder_select="h263_encoder"
 -rv20_decoder_select="error_resilience h263_decoder h263dsp mpeg_er"
 +rv20_decoder_select="h263_decoder"
  rv20_encoder_select="h263_encoder"
 -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"
 -screenpresso_decoder_deps="zlib"
 +rv30_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp"
 +rv40_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp"
 +screenpresso_decoder_select="zlib"
- shorten_decoder_select="golomb bswapdsp"
++shorten_decoder_select="bswapdsp"
  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"