[FFmpeg-cvslog] Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
Michael Niedermayer
git at videolan.org
Thu Feb 7 13:41:09 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 7 13:35:49 2013 +0100| [60a0bc46cdba5f13d557624d3448628328ad0fb0] | committer: Michael Niedermayer
Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
h264chroma: x86: Fix building with yasm disabled
rv34: Drop now unnecessary dsputil dependencies
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60a0bc46cdba5f13d557624d3448628328ad0fb0
---
More information about the ffmpeg-cvslog
mailing list