[FFmpeg-cvslog] Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'
Michael Niedermayer
git at videolan.org
Tue Jun 3 18:41:23 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 3 18:19:21 2014 +0200| [83e8650f7703b47d9762d9ef0e520b67f92b5aba] | committer: Michael Niedermayer
Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'
* commit '896a5bff64264f4d01ed98eacc97a67260c1e17e':
arm: check if AS supports .dn
Conflicts:
configure
libavcodec/arm/vc1dsp_init_neon.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83e8650f7703b47d9762d9ef0e520b67f92b5aba
---
More information about the ffmpeg-cvslog
mailing list