diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 11:54:38 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 12:04:21 +0100 |
commit | d66ca43fc1f62f057d43140e7a5905390739bfc7 (patch) | |
tree | 1707014dbbf8693589068934a6c29fc41511b026 | |
parent | 153073201cdcfd641042114b2bd39b00a532cbb9 (diff) | |
parent | 1188119624e42c1b2ce5be6137d2e6c6f4f03328 (diff) | |
download | ffmpeg-streaming-d66ca43fc1f62f057d43140e7a5905390739bfc7.zip ffmpeg-streaming-d66ca43fc1f62f057d43140e7a5905390739bfc7.tar.gz |
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@gmx.at>
0 files changed, 0 insertions, 0 deletions