[FFmpeg-cvslog] Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
Michael Niedermayer
git at videolan.org
Fri Oct 19 13:54:25 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 19 13:47:47 2012 +0200| [93f244e3abc3d75a797535a8da890bb1f9932433] | committer: Michael Niedermayer
Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
avformat: Fix references to the removed function av_write_header in comments
changelog: Mention the MSVC DLL support
fate: add dependencies for misc microsoft codecs
fate-twinvq: add dependencies
fate-mpc: add dependencies
fate-indeo: add dependencies
fate-als: add dependencies
fate: dependencies for demux tests
Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93f244e3abc3d75a797535a8da890bb1f9932433
---
More information about the ffmpeg-cvslog
mailing list