1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'

* commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0':
  build: Record explicit dependency of intrax8 on error resilience

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-23 00:45:58 +02:00
commit 7695a538ed

1
configure vendored
View File

@ -1992,6 +1992,7 @@ threads_if_any="$THREADS_LIST"
dct_select="rdft"
error_resilience_select="dsputil"
frame_thread_encoder_deps="encoders threads"
intrax8_select="error_resilience"
mdct_select="fft"
rdft_select="fft"
mpegaudio_select="mpegaudiodsp"