diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 12:13:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 12:14:56 +0100 |
| commit | 75afbe2ab4a14cdfdc4001869ae67ded99cf5ce7 (patch) | |
| tree | a71971845a2b85bddf8bbcfe4227dd370341f000 /libavresample/x86/Makefile | |
| parent | 34c1c08c665389daa190cb331e4d899da8dde57a (diff) | |
| parent | 1fb8f6a44f06e48386450fe0363aefc02583d24a (diff) | |
| download | ffmpeg-75afbe2ab4a14cdfdc4001869ae67ded99cf5ce7.tar.gz | |
Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'
* commit '1fb8f6a44f06e48386450fe0363aefc02583d24a':
x86: lavr: add SSE2 quantize() for dithering
doc/APIchanges: fill in missing dates and hashes.
rtpdec_vp8: Request a keyframe if RTP packets are lost
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/x86/Makefile')
| -rw-r--r-- | libavresample/x86/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavresample/x86/Makefile b/libavresample/x86/Makefile index 65bed899ba..2e8786fb90 100644 --- a/libavresample/x86/Makefile +++ b/libavresample/x86/Makefile @@ -1,5 +1,7 @@ OBJS += x86/audio_convert_init.o \ x86/audio_mix_init.o \ + x86/dither_init.o \ YASM-OBJS += x86/audio_convert.o \ x86/audio_mix.o \ + x86/dither.o \ |