Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Apr 2015 18:03:16 +0000 (20:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Apr 2015 18:03:16 +0000 (20:03 +0200)
commit67ac31d1bec2c670bf13a12e04b201a2909a6a1a
tree2cb45c184e9c2b593afef987dfb182eb04440102
parent12da8bc38dca53119d44cbbefad0a2b24dc551f5
parent247aa7af7d8197247c181e3fbfe8d93d75e41b29
Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'

* commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29':
  avisynth: Simplify shared library name construction

Conflicts:
libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avisynth.c