diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 21:38:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 21:38:58 +0200 |
| commit | e8676c758a627efc1744e2084c01e832c03ed2d0 (patch) | |
| tree | d2c287116454898f2cf892974e45ced6fe4ef8a8 /libavformat/txd.c | |
| parent | 876a663c668165e13feb7bad829d6ac034a6d416 (diff) | |
| parent | 72cebae0d981dde144340cf51f3c323f01e215e5 (diff) | |
| download | ffmpeg-e8676c758a627efc1744e2084c01e832c03ed2d0.tar.gz | |
Merge commit '72cebae0d981dde144340cf51f3c323f01e215e5'
* commit '72cebae0d981dde144340cf51f3c323f01e215e5':
ppc: avutil: Use the abriged vector types
Conflicts:
libavutil/ppc/float_dsp_altivec.c
libavutil/ppc/util_altivec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/txd.c')
0 files changed, 0 insertions, 0 deletions