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 /libavfilter/avf_showwaves.c | |
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 'libavfilter/avf_showwaves.c')
0 files changed, 0 insertions, 0 deletions