mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 08:42:39 +00:00
509f502902
* qatar/master: x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place trasher: Include all the necessary headers x86: Remove some leftover declarations for non-existent functions ARM: libavresample: NEON optimised generic fltp to s16 conversion ARM: libavresample: NEON optimised stereo fltp to s16 conversion ARM: libavresample: NEON optimised flat float to s16 conversion Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
aviocat.c | ||
bisect-create | ||
build_libstagefright | ||
clean-diff | ||
cws2fws.c | ||
enum_options.c | ||
ffeval.c | ||
graph2dot.c | ||
ismindex.c | ||
make_chlayout_test | ||
missing_codec_desc | ||
patcheck | ||
pktdumper.c | ||
probetest.c | ||
qt-faststart.c | ||
trasher.c | ||
unwrap-diff |