diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 23:12:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 23:15:20 +0200 |
| commit | 83b8987df70212970a564467aff415157f98f8de (patch) | |
| tree | 27e711f73e31c839a1fa9db18e9f60c2b039222b /libavcodec/bmp.c | |
| parent | 1fe40e1b0538a8eb8425123c47775b5d141ae084 (diff) | |
| parent | d6d767d93e532246cacf3567e6bcad76a821f838 (diff) | |
| download | ffmpeg-83b8987df70212970a564467aff415157f98f8de.tar.gz | |
Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'
* commit 'd6d767d93e532246cacf3567e6bcad76a821f838':
ppc: Fix compilation for ppc64le (ELFv2)
Conflicts:
libavcodec/ppc/asm.S
See: 41b928c5fad7d4ed8477b68cb0c2d54a70b0afac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp.c')
0 files changed, 0 insertions, 0 deletions