diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:52:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:52:58 +0200 |
| commit | 055e5c8e01c57783207861c96a5affbcd9e40160 (patch) | |
| tree | 7d6f1377c330a8ea1df29aca76e6c3b4ed01fc4d /libavcodec/j2k.h | |
| parent | d0aa60da10229d79aaa087d47dff92fc7518f1e8 (diff) | |
| parent | 47e5a98174eb9c07ad17be71df129719d60ec8b7 (diff) | |
| download | ffmpeg-streaming-055e5c8e01c57783207861c96a5affbcd9e40160.zip ffmpeg-streaming-055e5c8e01c57783207861c96a5affbcd9e40160.tar.gz | |
Merge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'
* commit '47e5a98174eb9c07ad17be71df129719d60ec8b7':
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.h
libavcodec/ppc/hpeldsp_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2k.h')
0 files changed, 0 insertions, 0 deletions
