[FFmpeg-cvslog] Merge commit '44aa9105c535471ca9e23796d7ca29b341f47636'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 11:30:32 2017 -0300| [24f1685f6eb2af6326acec9a06678e7127b9f9dc] | committer: James Almer

Merge commit '44aa9105c535471ca9e23796d7ca29b341f47636'

* commit '44aa9105c535471ca9e23796d7ca29b341f47636':
  makedef: Fold as much text transformations as possible into the initial dump

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24f1685f6eb2af6326acec9a06678e7127b9f9dc
---

 compat/windows/makedef | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compat/windows/makedef b/compat/windows/makedef
index fcaf108332..b3de99255c 100755
--- a/compat/windows/makedef
+++ b/compat/windows/makedef
@@ -112,7 +112,10 @@ for line in $(cat ${vscript} | tr '\t' ' '); do
 '
 done
 
-dump=$(dumpbin -linkermember:1 ${libname})
+dump=$(dumpbin -linkermember:1 ${libname} |
+          sed -e '/public symbols/,$!d' -e '/^ \{1,\}Summary/,$d' -e "s/ \{1,\}${prefix}/ /" -e 's/ \{1,\}/ /g' |
+          tail -n +2 |
+          cut -d' ' -f3)
 
 rm ${libname}
 
@@ -121,9 +124,6 @@ list=""
 for exp in ${regex}; do
     list="${list}"'
 '$(echo "${dump}" |
-          sed -e '/public symbols/,$!d' -e '/^ \{1,\}Summary/,$d' -e "s/ \{1,\}${prefix}/ /" -e 's/ \{1,\}/ /g' |
-          tail -n +2 |
-          cut -d' ' -f3 |
           grep "^${exp}" |
           sed -e 's/^/    /')
 done


======================================================================