diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 20:53:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 20:53:37 +0200 |
| commit | a6e782434a218a51b243c00c2b844b7abb4d4509 (patch) | |
| tree | 6ef5fb87468a66c2383aeac9d442d3783c4b600f /libswscale | |
| parent | 32cc7dacde6d4970719cb59ec58ec48f64291ee9 (diff) | |
| parent | dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c (diff) | |
| download | ffmpeg-a6e782434a218a51b243c00c2b844b7abb4d4509.tar.gz | |
Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'
* commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c':
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions