[FFmpeg-cvslog] Merge commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328'

Michael Niedermayer git at videolan.org
Tue Mar 24 12:04:32 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 24 11:54:38 2015 +0100| [d66ca43fc1f62f057d43140e7a5905390739bfc7] | committer: Michael Niedermayer

Merge commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328'

* commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328':
  avisynth: update documentation about the avisynth_c.h header

Conflicts:
	doc/general.texi

Not merged as FFmpeg provides the needed headers in compat/

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

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





More information about the ffmpeg-cvslog mailing list