Merge commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:11:03 +0000 (18:11 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:11:03 +0000 (18:11 +0000)
* commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba':
  build: More precise dependencies for h264dsp

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -2225,9 -1858,10 +2225,10 @@@ dirac_parse_select="golomb
  error_resilience_select="me_cmp"
  faandct_deps="faan fdctdsp"
  faanidct_deps="faan idctdsp"
+ h264dsp_select="startcode"
 +frame_thread_encoder_deps="encoders threads"
  intrax8_select="error_resilience"
  mdct_select="fft"
 -rdft_select="fft"
  me_cmp_select="fdctdsp idctdsp pixblockdsp"
  mpeg_er_select="error_resilience"
  mpegaudio_select="mpegaudiodsp"
@@@ -2306,17 -1933,17 +2307,17 @@@ flv_decoder_select="h263_decoder
  flv_encoder_select="h263_encoder"
  fourxm_decoder_select="blockdsp bswapdsp"
  fraps_decoder_select="bswapdsp huffman"
 -g2m_decoder_deps="zlib"
 -g2m_decoder_select="blockdsp idctdsp jpegtables"
 -h261_decoder_select="mpeg_er mpegvideo"
 +g2m_decoder_select="blockdsp idctdsp jpegtables zlib"
 +g729_decoder_select="audiodsp"
 +h261_decoder_select="mpegvideo"
  h261_encoder_select="aandcttables mpegvideoenc"
 -h263_decoder_select="error_resilience h263_parser h263dsp mpeg_er mpegvideo qpeldsp"
 +h263_decoder_select="h263_parser h263dsp mpegvideo qpeldsp"
  h263_encoder_select="aandcttables h263dsp mpegvideoenc"
  h263i_decoder_select="h263_decoder"
 +h263p_decoder_select="h263_decoder"
  h263p_encoder_select="h263_encoder"
- h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel startcode videodsp"
+ h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel videodsp"
  h264_decoder_suggest="error_resilience"
 -h264_nvenc_encoder_deps="nvenc"
  h264_qsv_decoder_deps="libmfx"
  h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
  h264_qsv_encoder_deps="libmfx"