RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 9d91fae8a1 fbf4d2197f
commit 7695a538ed
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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"