diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:30:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:53:33 +0100 |
| commit | 77bc34297596476c1644a497615038d18eed63fe (patch) | |
| tree | 901172b5bb0d19d05710e6c144425173dcec9022 /libavcodec/vc1.c | |
| parent | 672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (diff) | |
| parent | 322a1dda973e802db7b57f2007fad3efcd5bab81 (diff) | |
| download | ffmpeg-77bc34297596476c1644a497615038d18eed63fe.tar.gz | |
Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
0 files changed, 0 insertions, 0 deletions