diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 10:18:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 10:18:46 +0200 |
| commit | eda9d97b7a1dcebc6684f88e4f6472e18bd6b9f0 (patch) | |
| tree | dd392912ac784cc1bffad9ce312dd058cd8e768b /ffplay.c | |
| parent | 56ba3312574fee02c037066aeed861a1be53f1cd (diff) | |
| parent | 46bb456853b197f4562de7acf5d42abf11ded9be (diff) | |
Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
x86: dsputil: Refactor pixels16 wrapper functions with a macro
Conflicts:
libavcodec/x86/hpeldsp_avg_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions