ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sat Nov 11 16:59:36 2017 -0300| [ab7c8e1d6cc976c796735caa1e9210cf06792111] | committer: James Almer
Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed' * commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed': makedef: Add support for identifying the ARM64 machine type Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab7c8e1d6cc976c796735caa1e9210cf06792111 --- compat/windows/makedef | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat/windows/makedef b/compat/windows/makedef index fd7959a745..0cd169c15c 100755 --- a/compat/windows/makedef +++ b/compat/windows/makedef @@ -74,12 +74,12 @@ else tr '\t' ' ' | grep '^ \+.\+machine \+(.\+)' | head -1 | - sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(...\)).*/\1/') + sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(.\{3,5\}\)).*/\1/') if [ "${arch}" = "x86" ]; then prefix="_" else - if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ]; then + if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ] && [ "${arch}" != "ARM64" ]; then echo "Unknown machine type." >&2 exit 1 fi ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
