[FFmpeg-cvslog] Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'

Michael Niedermayer git at videolan.org
Fri Apr 17 20:20:55 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 17 20:03:16 2015 +0200| [67ac31d1bec2c670bf13a12e04b201a2909a6a1a] | committer: Michael Niedermayer

Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'

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

Conflicts:
	libavformat/avisynth.c

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

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





More information about the ffmpeg-cvslog mailing list