Commit 96b02460 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b5f112d8'

* commit 'b5f112d8':
  configure: Add explicit dsputil dependency to mpegvideoenc

Conflicts:
	configure
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents daded4f8 b5f112d8
...@@ -1900,7 +1900,7 @@ rdft_select="fft" ...@@ -1900,7 +1900,7 @@ rdft_select="fft"
mpegaudio_select="mpegaudiodsp" mpegaudio_select="mpegaudiodsp"
mpegaudiodsp_select="dct" mpegaudiodsp_select="dct"
mpegvideo_select="dsputil h264chroma hpeldsp videodsp" mpegvideo_select="dsputil h264chroma hpeldsp videodsp"
mpegvideoenc_select="mpegvideo" mpegvideoenc_select="dsputil mpegvideo"
# decoders / encoders # decoders / encoders
aac_decoder_select="mdct sinewin" aac_decoder_select="mdct sinewin"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment