diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 20:03:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 20:03:36 +0100 |
commit | dd87d4a318b36cd246ca2fc40e74565f4bf2abfd (patch) | |
tree | ae47e78b2d0fe6d89c73affa49e0bcce10051c21 /libavfilter/buffersink.h | |
parent | 01d012ba3db91d555b6905d21afcb232150b9ecf (diff) | |
parent | 52acd79165e70799871a2feeb02b4fdc0d38a956 (diff) | |
download | ffmpeg-dd87d4a318b36cd246ca2fc40e74565f4bf2abfd.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
configure: Add a comment indicating why uclibc is checked before glibc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersink.h')
0 files changed, 0 insertions, 0 deletions