Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 18:20:19 +0000 (20:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 18:20:39 +0000 (20:20 +0200)
* commit '93e15a323871613fd26f1f1e317029a50b5b24ca':
  fic: use correct IDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/fic.c

diff --cc configure
+++ b/configure
@@@ -2021,13 -1737,12 +2021,13 @@@ ffv1_decoder_select="golomb rangecoder
  ffv1_encoder_select="rangecoder"
  ffvhuff_decoder_select="huffyuv_decoder"
  ffvhuff_encoder_select="huffyuv_encoder"
- fic_decoder_select="dsputil golomb"
+ fic_decoder_select="golomb"
  flac_decoder_select="golomb"
  flac_encoder_select="dsputil golomb lpc"
 -flashsv_decoder_deps="zlib"
 -flashsv_encoder_deps="zlib"
 -flashsv2_decoder_deps="zlib"
 +flashsv_decoder_select="zlib"
 +flashsv_encoder_select="zlib"
 +flashsv2_encoder_select="zlib"
 +flashsv2_decoder_select="zlib"
  flv_decoder_select="h263_decoder"
  flv_encoder_select="h263_encoder"
  fourxm_decoder_select="dsputil"
Simple merge