diff options
author | Thilo Borgmann <thilo.borgmann@googlemail.com> | 2013-08-21 18:26:40 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 19:00:48 +0200 |
commit | ffa18de2e6ccceec6144679fad9390b2034b3a66 (patch) | |
tree | e007fc133d8bf27e59d7fb4a29378c13c27c22d5 | |
parent | 71c5f9d29c9ed9cbad3f88fe5ef8098bdb4b4859 (diff) | |
download | ffmpeg-ffa18de2e6ccceec6144679fad9390b2034b3a66.tar.gz |
configure: Add exif to CONFIG_EXTRA.
Add exif as a common component in CONFIG_EXTRA in order to avoid many
dependencies to 'exif.o tiff_common.o' in lavc/Makefile.
-rwxr-xr-x | configure | 16 | ||||
-rw-r--r-- | libavcodec/Makefile | 3 |
2 files changed, 11 insertions, 8 deletions
@@ -1556,6 +1556,7 @@ CONFIG_EXTRA=" ac3dsp audio_frame_queue dsputil + exif frame_thread_encoder gcrypt golomb @@ -1740,7 +1741,7 @@ alac_encoder_select="lpc" als_decoder_select="dsputil" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" -amv_decoder_select="dsputil hpeldsp" +amv_decoder_select="dsputil hpeldsp exif" amv_encoder_select="aandcttables" ape_decoder_select="dsputil" asv1_decoder_select="dsputil" @@ -1749,6 +1750,7 @@ asv2_decoder_select="dsputil" asv2_encoder_select="dsputil" atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" +avrn_decoder_select="exif" bink_decoder_select="dsputil hpeldsp" binkaudio_dct_decoder_select="mdct rdft dct sinewin" binkaudio_rdft_decoder_select="mdct rdft sinewin" @@ -1802,7 +1804,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" +jpegls_decoder_select="dsputil golomb hpeldsp exif" jpegls_encoder_select="golomb" jv_decoder_select="dsputil" lagarith_decoder_select="dsputil" @@ -1811,8 +1813,8 @@ loco_decoder_select="golomb" mdec_decoder_select="dsputil error_resilience mpegvideo" metasound_decoder_select="lsp mdct sinewin" mimic_decoder_select="dsputil hpeldsp" -mjpeg_decoder_select="dsputil hpeldsp" -mjpegb_decoder_select="dsputil hpeldsp" +mjpeg_decoder_select="dsputil hpeldsp exif" +mjpegb_decoder_select="dsputil hpeldsp exif" mjpeg_encoder_select="aandcttables dsputil mpegvideoenc" mlp_decoder_select="dsputil mlp_parser" motionpixels_decoder_select="dsputil" @@ -1842,7 +1844,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" +mxpeg_decoder_select="dsputil hpeldsp exif" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="dsputil lzo" @@ -1869,7 +1871,7 @@ snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rang sonic_decoder_select="golomb" sonic_encoder_select="golomb" sonic_ls_encoder_select="golomb" -sp5x_decoder_select="dsputil hpeldsp" +sp5x_decoder_select="dsputil hpeldsp exif" svq1_decoder_select="hpeldsp" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel hpeldsp mpegvideo videodsp" @@ -1878,7 +1880,7 @@ tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" -thp_decoder_select="dsputil hpeldsp" +thp_decoder_select="dsputil hpeldsp exif" truehd_decoder_select="mlp_parser" truemotion2_decoder_select="dsputil" truespeech_decoder_select="dsputil" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 650aed4020..ec2cbfb560 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -44,6 +44,7 @@ OBJS-$(CONFIG_DSPUTIL) += dsputil.o faanidct.o \ simple_idct.o jrevdct.o OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o +OBJS-$(CONFIG_EXIF) += exif.o tiff_common.o FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \ fft_fixed_32.o fft_init_table.o \ @@ -267,7 +268,7 @@ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \ twinvq.o OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o -OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o exif.o tiff_common.o +OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o |