aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-13 21:35:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-13 21:35:56 +0100
commit96b02460fce59edca54fa2992c2d6e431596df9e (patch)
tree21003fc8af9c11ff05f66727acb31dafbf0157a2
parentdaded4f89a7762a685ae3b5119eec14fc24192a9 (diff)
parentb5f112d820934ade66e809ef30bfcfc8210929f8 (diff)
downloadffmpeg-96b02460fce59edca54fa2992c2d6e431596df9e.tar.gz
Merge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8'
* commit 'b5f112d820934ade66e809ef30bfcfc8210929f8': configure: Add explicit dsputil dependency to mpegvideoenc Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 231ebcd254..e09742f59d 100755
--- a/configure
+++ b/configure
@@ -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"