[FFmpeg-cvslog] Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'
Michael Niedermayer
git at videolan.org
Fri Jul 18 22:14:14 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 18 21:55:55 2014 +0200| [42d326353c17085a98f0e81844f0c6320d70e8f3] | committer: Michael Niedermayer
Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'
* commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae':
idct: Convert IDCT permutation #defines to an enum
Conflicts:
libavcodec/idctdsp.c
libavcodec/x86/cavsdsp.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42d326353c17085a98f0e81844f0c6320d70e8f3
---
More information about the ffmpeg-cvslog
mailing list