ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Jul 13
21:08:28 2014 +0200| [98227ba5fa456b5dacd404e125420c9abf87ff95] | committer:
Michael Niedermayer
Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78'
* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78':
ppc: dsputil: Coalesce all init files
Conflicts:
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98227ba5fa456b5dacd404e125420c9abf87ff95
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
