diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:13:54 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:13:54 +0100 |
commit | 24604ebaf85b5436d10da811f455dd710b353aca (patch) | |
tree | 46988a19c56e7914715dc3852e6588fb887c6c77 /libavresample/dither.c | |
parent | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (diff) | |
parent | 5959bfaca396ecaf63a8123055f499688b79cae3 (diff) | |
download | ffmpeg-24604ebaf85b5436d10da811f455dd710b353aca.tar.gz |
Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
floatdsp: move butterflies_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/dither.c')
0 files changed, 0 insertions, 0 deletions