Changeset 67ac31d1 in ffmpeg

Timestamp:

Apr 17, 2015, 6:03:16 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

04fbab14

Parents:

12da8bc3 (diff), 247aa7af (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'

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

Conflicts:

libavformat/avisynth.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)