diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:35:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:35:56 +0100 |
| commit | 96b02460fce59edca54fa2992c2d6e431596df9e (patch) | |
| tree | 21003fc8af9c11ff05f66727acb31dafbf0157a2 /configure | |
| parent | daded4f89a7762a685ae3b5119eec14fc24192a9 (diff) | |
| parent | b5f112d820934ade66e809ef30bfcfc8210929f8 (diff) | |
Merge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8'
* commit 'b5f112d820934ade66e809ef30bfcfc8210929f8':
configure: Add explicit dsputil dependency to mpegvideoenc
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1900,7 +1900,7 @@ rdft_select="fft" mpegaudio_select="mpegaudiodsp" mpegaudiodsp_select="dct" mpegvideo_select="dsputil h264chroma hpeldsp videodsp" -mpegvideoenc_select="mpegvideo" +mpegvideoenc_select="dsputil mpegvideo" # decoders / encoders aac_decoder_select="mdct sinewin" |