summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-11 13:37:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-11 13:38:37 +0100
commitf137d5763dbaf352bef6453ac0dcc16c1248137c (patch)
tree5b214bb56fb5b39d73699b4a5434d3579dddee41 /configure
parent6fc064893270be7549eccc78fd085ca8521ad9f2 (diff)
parentd11cb13b0ef02fb1c303b29805819f6e1c9dc61b (diff)
downloadffmpeg-streaming-f137d5763dbaf352bef6453ac0dcc16c1248137c.zip
ffmpeg-streaming-f137d5763dbaf352bef6453ac0dcc16c1248137c.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: configure: enable pic for shared libs on AArch64 zmbv: Reset the decoder on keyframe errors 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 576905c..889b186 100755
--- a/configure
+++ b/configure
@@ -3076,7 +3076,7 @@ check_64bit(){
}
case "$arch" in
- alpha|ia64)
+ aarch64|alpha|ia64)
spic=$shared
;;
mips)
OpenPOWER on IntegriCloud