diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 14:53:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 15:13:53 +0200 |
| commit | 67d501b4f1758ba0783b14da4a6b3abd506792fa (patch) | |
| tree | d9160dbe01eead7675731eaecfcabb24616fa79d /configure | |
| parent | b90210e9c5ea365befef61b10b9a34ce37f9e679 (diff) | |
| parent | 1b3439b3055b083df51d7f7838ecc6b3f708b15c (diff) | |
| download | ffmpeg-67d501b4f1758ba0783b14da4a6b3abd506792fa.tar.gz | |
Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'
* commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c':
mpegvideo: move frame size dependent memory management to separate functions
configure: add --toolchain option
configure: Make the smoothstreaming muxer enable the ismv muxer
smoothstreaming: Export the mp4 codec tags
mov: check for EOF in long lasting loops
avcodec: cleanup utils.c
binkaudio: remove unneeded GET_BITS_SAFE macro
binkaudio: use float sample format
binkaudio: use a different value for the coefficient scale for the DCT codec
Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -232,6 +232,7 @@ Advanced options (experts only): --target-os=OS compiler targets OS [$target_os] --target-exec=CMD command to run executables on target --target-path=DIR path to view of build directory on target + --toolchain=NAME set tool defaults according to NAME --nm=NM use nm tool NM [$nm_default] --ar=AR use archive tool AR [$ar_default] --as=AS use assembler AS [$as_default] @@ -1485,6 +1486,7 @@ CMDLINE_SET=" target_exec target_os target_path + toolchain valgrind yasmexe " @@ -1813,6 +1815,7 @@ rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol" sap_demuxer_select="sdp_demuxer" sap_muxer_select="rtp_muxer rtp_protocol" sdp_demuxer_select="rtpdec" +smoothstreaming_muxer_select="ismv_muxer" spdif_muxer_select="aac_parser" tg2_muxer_select="mov_muxer" tgp_muxer_select="mov_muxer" @@ -2308,6 +2311,17 @@ strip_default="${cross_prefix}${strip_default}" sysinclude_default="${sysroot}/usr/include" +case "$toolchain" in + msvc) + cc_default="c99wrap cl" + ld_default="c99wrap link" + nm_default="dumpbin -symbols" + ;; + ?*) + die "Unknown toolchain $toolchain" + ;; +esac + set_default cc cxx pkg_config strip sysinclude yasmexe enabled cross_compile || host_cc_default=$cc set_default host_cc |