aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-01 02:55:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-01 02:58:15 +0200
commit7ac167493e5404fd2d3f307d02127f23fca970f0 (patch)
treebea8a71cd59b1ea9a63692f7df1bdedb8446a9c1 /configure
parent859676dd426e7051b41b174886e6e64271e93cdc (diff)
parente006d71fa849542eb27146efac629288703b3d75 (diff)
downloadffmpeg-7ac167493e5404fd2d3f307d02127f23fca970f0.tar.gz
Merge remote-tracking branch 'newdev/master'
* newdev/master: mpegts: propagate avio EOF in read_packet() configure: Initial support for --target-os=symbian Fixed-point FFT and MDCT Include dependencies for test programs ac3enc: simplify sym_quant() flvdec: read index stored in the 'keyframes' tag. mov: Add support for zero-sized stsc runs. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index 435bb629af..7bae5c9359 100755
--- a/configure
+++ b/configure
@@ -1845,7 +1845,7 @@ set_default host_cc
exesuf() {
case $1 in
- mingw32*|cygwin*|*-dos|freedos|opendos|os/2*) echo .exe ;;
+ mingw32*|cygwin*|*-dos|freedos|opendos|os/2*|symbian) echo .exe ;;
esac
}
@@ -2506,6 +2506,11 @@ case $target_os in
add_cppflags -D_QNX_SOURCE
network_extralibs="-lsocket"
;;
+ symbian)
+ SLIBSUF=".dll"
+ enable dos_paths
+ add_cflags --include=$sysinclude/gcce/gcce.h
+ ;;
none)
;;
*)