diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:17:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:17:51 +0100 |
| commit | ad48c9374e13ecdf1399c44e9ea443a77232168a (patch) | |
| tree | 3432550c5a40fc663d8914c8806918b910633783 /configure | |
| parent | c4c2b2ea5c0a1879f512c2023956d7322edc98d3 (diff) | |
| parent | 8e0cf39faf02536dca08f4fe628a66d1ae022fde (diff) | |
| download | ffmpeg-streaming-ad48c9374e13ecdf1399c44e9ea443a77232168a.zip ffmpeg-streaming-ad48c9374e13ecdf1399c44e9ea443a77232168a.tar.gz | |
Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'
* commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde':
build: Let all MJPEG-related decoders depend on the MJPEG decoder
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1954,7 +1954,7 @@ iac_decoder_select="dsputil fft mdct sinewin" imc_decoder_select="dsputil fft mdct sinewin" indeo3_decoder_select="hpeldsp" interplay_video_decoder_select="hpeldsp" -jpegls_decoder_select="dsputil golomb hpeldsp exif" +jpegls_decoder_select="golomb mjpeg_decoder" jpegls_encoder_select="golomb" jv_decoder_select="dsputil" lagarith_decoder_select="dsputil" @@ -1964,7 +1964,7 @@ mdec_decoder_select="dsputil error_resilience mpegvideo" metasound_decoder_select="lsp mdct sinewin" mimic_decoder_select="dsputil hpeldsp" mjpeg_decoder_select="dsputil hpeldsp exif" -mjpegb_decoder_select="dsputil hpeldsp exif" +mjpegb_decoder_select="mjpeg_decoder" mjpeg_encoder_select="aandcttables dsputil mpegvideoenc" mlp_decoder_select="dsputil mlp_parser" motionpixels_decoder_select="dsputil" @@ -1994,7 +1994,7 @@ msmpeg4v2_encoder_select="h263_encoder" msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_encoder_select="h263_encoder" mss2_decoder_select="error_resilience vc1_decoder" -mxpeg_decoder_select="dsputil hpeldsp exif" +mxpeg_decoder_select="mjpeg_decoder" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="dsputil lzo" @@ -2020,7 +2020,7 @@ snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rang sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" sonic_ls_encoder_select="golomb" -sp5x_decoder_select="dsputil hpeldsp exif" +sp5x_decoder_select="mjpeg_decoder" svq1_decoder_select="hpeldsp" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp" @@ -2029,7 +2029,7 @@ tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" -thp_decoder_select="dsputil hpeldsp exif" +thp_decoder_select="mjpeg_decoder" truehd_decoder_select="mlp_parser" truemotion2_decoder_select="dsputil" truespeech_decoder_select="dsputil" |
