From 2b09078a614370d20c715cc420cfbe6861c43f00 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 4 Mar 2013 11:39:44 +0100 Subject: [PATCH 1/4] Add h264chroma dependency for vp5 and vp6 decoder to configure. Fix building for some unusual configurations. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a3be9a8d47..516d313a1e 100755 --- a/configure +++ b/configure @@ -1783,8 +1783,8 @@ vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" vp3_decoder_select="vp3dsp videodsp" -vp5_decoder_select="vp3dsp videodsp" -vp6_decoder_select="huffman vp3dsp videodsp" +vp5_decoder_select="h264chroma vp3dsp videodsp" +vp6_decoder_select="h264chroma huffman vp3dsp videodsp" vp6a_decoder_select="vp6_decoder" vp6f_decoder_select="vp6_decoder" vp8_decoder_select="h264pred videodsp" From 9051e297d27671c85176dfd73594f443cd75a366 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 4 Mar 2013 11:43:09 +0100 Subject: [PATCH 2/4] Add h264qpel dependency for snow codec to configure. Fix building for some unusual configurations. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 516d313a1e..0f6b23f528 100755 --- a/configure +++ b/configure @@ -1762,8 +1762,8 @@ rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvi rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" shorten_decoder_select="golomb" sipr_decoder_select="lsp" -snow_decoder_select="dwt rangecoder" -snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder" +snow_decoder_select="dwt h264qpel rangecoder" +snow_encoder_select="aandcttables dwt h264qpel error_resilience mpegvideoenc rangecoder" sonic_decoder_select="golomb" sonic_encoder_select="golomb" sonic_ls_encoder_select="golomb" From 523b12affc0083f0282a80a8d12c75c16b6af604 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 4 Mar 2013 11:43:55 +0100 Subject: [PATCH 3/4] Add h264chroma dependency for cavs decoder to configure. Fix building for some unusual configurations. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 0f6b23f528..52e4253349 100755 --- a/configure +++ b/configure @@ -1674,7 +1674,7 @@ atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" binkaudio_dct_decoder_select="mdct rdft dct sinewin" binkaudio_rdft_decoder_select="mdct rdft sinewin" -cavs_decoder_select="golomb mpegvideo" +cavs_decoder_select="golomb h264chroma mpegvideo" comfortnoise_encoder_select="lpc" cook_decoder_select="mdct sinewin" cscd_decoder_select="lzo" From 03148fd1743fca98c2f4b5920b796f381e820045 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 4 Mar 2013 12:25:02 +0100 Subject: [PATCH 4/4] buildsys: only include log2_tab per library for shared builds Fix linking failures with -all_load due to multiple log2_tabs Signed-off-by: Carl Eugen Hoyos --- libavcodec/Makefile | 2 +- libavformat/Makefile | 2 +- libswresample/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 52282e30d0..dc065a51d4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -25,7 +25,6 @@ OBJS = allcodecs.o \ fmtconvert.o \ imgconvert.o \ jrevdct.o \ - log2_tab.o \ mathtables.o \ options.o \ parser.o \ @@ -70,6 +69,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ OBJS-$(CONFIG_RANGECODER) += rangecoder.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) +OBJS-$(CONFIG_SHARED) += log2_tab.o OBJS-$(CONFIG_SINEWIN) += sinewin.o OBJS-$(CONFIG_VAAPI) += vaapi.o OBJS-$(CONFIG_VDPAU) += vdpau.o diff --git a/libavformat/Makefile b/libavformat/Makefile index 03d7e2357b..73ada77275 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -13,7 +13,6 @@ OBJS = allformats.o \ cutils.o \ id3v1.o \ id3v2.o \ - log2_tab.o \ metadata.o \ mux.o \ options.o \ @@ -48,6 +47,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_xiph.o \ srtp.o OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o +OBJS-$(CONFIG_SHARED) += log2_tab.o # muxers/demuxers OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o diff --git a/libswresample/Makefile b/libswresample/Makefile index 9d9f10c6c6..0b75bd0821 100644 --- a/libswresample/Makefile +++ b/libswresample/Makefile @@ -8,11 +8,11 @@ HEADERS = swresample.h \ OBJS = audioconvert.o \ dither.o \ - log2_tab.o \ rematrix.o \ resample.o \ swresample.o \ OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o +OBJS-$(CONFIG_SHARED) += log2_tab.o TESTPROGS = swresample