diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 12:02:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 12:02:53 +0200 |
| commit | 62355b25ad5cdeca4f7b0380fc5ccc8714073be1 (patch) | |
| tree | 535f5141450be8f152af7e7b82608dc9b0ea6f38 /libavformat/rtpenc_jpeg.c | |
| parent | 8580977e30e3c18feff11c8b0eb5658c91e4683e (diff) | |
| parent | 987a8f8514e07aba8136d491949d0b8d6bb183f9 (diff) | |
| download | ffmpeg-62355b25ad5cdeca4f7b0380fc5ccc8714073be1.tar.gz | |
Merge commit '987a8f8514e07aba8136d491949d0b8d6bb183f9' into release/2.2
* commit '987a8f8514e07aba8136d491949d0b8d6bb183f9':
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 'libavformat/rtpenc_jpeg.c')
0 files changed, 0 insertions, 0 deletions