aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-26 01:12:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-26 01:12:08 +0100
commit022f8d27dd0a61bfaae729d53d133b17418ea16b (patch)
tree351bff9edab8404f7850ee05a238c50e6364e19b /configure
parenta11eeb921571b23d1c988f9a2ddda109792948a6 (diff)
parentf32dfad9dc64acf0fd1bb867e127a9efe6380676 (diff)
downloadffmpeg-022f8d27dd0a61bfaae729d53d133b17418ea16b.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 3fccf063e7..dccf63c6cf 100755
--- a/configure
+++ b/configure
@@ -2999,7 +2999,7 @@ disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
if ! disabled vda; then
if check_header VideoDecodeAcceleration/VDADecoder.h; then
enable vda
- add_ldflags -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore
+ add_extralibs -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore
fi
fi