[FFmpeg-cvslog] Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'
Michael Niedermayer
git at videolan.org
Thu Mar 6 15:00:05 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 6 14:09:48 2014 +0100| [2d99de66b7f1f805ae75d7502508ede18b52e95a] | committer: Michael Niedermayer
Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'
* commit '3bfdee00cd92ff07c364d4901c4aefda32780756':
x86: dcadsp: Fix linking with yasm and optimizations disabled
Conflicts:
libavcodec/x86/dcadsp_init.c
See: 206167a295a5c28cec3c38f7308835b0b7e0618f
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d99de66b7f1f805ae75d7502508ede18b52e95a
---
More information about the ffmpeg-cvslog
mailing list