[FFmpeg-cvslog] Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'
Michael Niedermayer
git at videolan.org
Fri May 30 23:24:17 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 30 23:12:45 2014 +0200| [83b8987df70212970a564467aff415157f98f8de] | committer: Michael Niedermayer
Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'
* commit 'd6d767d93e532246cacf3567e6bcad76a821f838':
ppc: Fix compilation for ppc64le (ELFv2)
Conflicts:
libavcodec/ppc/asm.S
See: 41b928c5fad7d4ed8477b68cb0c2d54a70b0afac
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83b8987df70212970a564467aff415157f98f8de
---
More information about the ffmpeg-cvslog
mailing list