diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-13 00:36:31 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-13 00:36:31 +0400 |
| commit | 694fa0035af5befaa3bbbfc500434877895e2e36 (patch) | |
| tree | 59633870bbc495a4741245e09dad4dd81d5417c3 /libavutil | |
| parent | 43bf4ee9a9740bb8e223f9a8d449ec76a139dc44 (diff) | |
| parent | c51a3a5bd9a5b404176ff343ecadb80b2553b256 (diff) | |
Merge commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256'
* commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256':
x86: dsputil: Refactor some ff_{avg|put}_pixels function declarations
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions