diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:09:12 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:09:12 +0100 |
| commit | 909f5e71001f77a22fb76c440c9f73643b0c943b (patch) | |
| tree | aa1136ea78be3d5940dda6779c99c97cb9c2dd12 /configure | |
| parent | dff9894acdf83121b32aa8233d03c9e5dcd547c0 (diff) | |
| parent | 0c6a70873fc6e43194b471d112c30823b6c8d0b4 (diff) | |
| download | ffmpeg-909f5e71001f77a22fb76c440c9f73643b0c943b.tar.gz | |
Merge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'
* commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4':
intrax8: Move error resilience out of intrax8
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -2258,7 +2258,6 @@ faandct_deps="faan fdctdsp" faanidct_deps="faan idctdsp" h264dsp_select="startcode" frame_thread_encoder_deps="encoders threads" -intrax8_select="error_resilience" mdct_select="fft" me_cmp_select="fdctdsp idctdsp pixblockdsp" mpeg_er_select="error_resilience" @@ -2494,7 +2493,7 @@ wmav2_encoder_select="mdct sinewin wma_freqs" wmavoice_decoder_select="lsp rdft dct mdct sinewin" wmv1_decoder_select="h263_decoder" wmv1_encoder_select="h263_encoder" -wmv2_decoder_select="blockdsp h263_decoder idctdsp intrax8 videodsp wmv2dsp" +wmv2_decoder_select="blockdsp error_resilience h263_decoder idctdsp intrax8 videodsp wmv2dsp" wmv2_encoder_select="h263_encoder wmv2dsp" wmv3_decoder_select="vc1_decoder" wmv3image_decoder_select="wmv3_decoder" |