ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d66ca43fc1f62f057d43140e7a5905390739bfc7
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
