[FFmpeg-cvslog] Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
Michael Niedermayer
git at videolan.org
Sat Mar 22 23:26:23 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 23:21:54 2014 +0100| [74fed968d1b6f0aec9c08b9ac4fcad4314e0460a] | committer: Michael Niedermayer
Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
x86: dsputil: Move hpeldsp-related declarations to a separate header
Conflicts:
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74fed968d1b6f0aec9c08b9ac4fcad4314e0460a
---
More information about the ffmpeg-cvslog
mailing list