diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 21:39:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 21:39:10 +0100 |
| commit | c19f193c6b239782b10bd9df117da2e50468edf9 (patch) | |
| tree | ac46c2dcb072cf682392066789a472c0c97f96e0 /libavcodec/wmalosslessdec.c | |
| parent | 102b794e09482fec881e7ec903e57914895f9b74 (diff) | |
| parent | 61ae993957f8ff7e12c5983a1b21d5ec1965b328 (diff) | |
| download | ffmpeg-c19f193c6b239782b10bd9df117da2e50468edf9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: Fix intensity compensation performance regression
Conflicts:
libavcodec/vc1.c
See: ed5bed4152203aed8cce01a679bed67bbda8903f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmalosslessdec.c')
0 files changed, 0 insertions, 0 deletions