diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 14:18:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 14:19:15 +0100 |
| commit | 58eb9b929998f415edf714fc7d8e3a1949d930f3 (patch) | |
| tree | 4a01c70120f984ea0ad28e32d06bd43a39eb522f /libswresample/arm | |
| parent | 1df53ff22de2732596571ea98b8bad1c6dd42543 (diff) | |
| parent | 6d98959c8a5a749592a878b9523b31eccea5d102 (diff) | |
| download | ffmpeg-58eb9b929998f415edf714fc7d8e3a1949d930f3.tar.gz | |
Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'
* commit '6d98959c8a5a749592a878b9523b31eccea5d102':
vc1: Add avg_no_rnd_vc1_chroma_mc4_c()
Conflicts:
libavcodec/vc1dsp.c
See: dd6e291e4083b7af53968c0ae06330841f63405b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/arm')
0 files changed, 0 insertions, 0 deletions