diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:14:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:25:47 +0100 |
| commit | 1eb28479dab3d55a9c8aff63e0fb7a1dd3902cf0 (patch) | |
| tree | 8c3e71eec5cdb4399dfd71dd07b2830776015dd9 /libavcodec/cook_parser.c | |
| parent | 09f057170e52442a9136b8298bb37897cc81f9e9 (diff) | |
| parent | 48aef27f5232794e70ecef0d347b9f65e27a9bad (diff) | |
| download | ffmpeg-1eb28479dab3d55a9c8aff63e0fb7a1dd3902cf0.tar.gz | |
Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'
* commit '48aef27f5232794e70ecef0d347b9f65e27a9bad':
x86: Put COPY3_IF_LT under HAVE_6REGS
Conflicts:
libavcodec/x86/mathops.h
See: b38910c9790253b362839042a17e13252c1d4b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cook_parser.c')
0 files changed, 0 insertions, 0 deletions