[FFmpeg-cvslog] Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'
Michael Niedermayer
git at videolan.org
Tue Jul 30 11:30:46 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 11:26:39 2013 +0200| [c7d17179571daa875083e2fe72c498ae47772d75] | committer: Michael Niedermayer
Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8':
avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo
Conflicts:
doc/general.texi
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7d17179571daa875083e2fe72c498ae47772d75
---
More information about the ffmpeg-cvslog
mailing list