diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 22:01:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 22:01:58 +0200 |
| commit | dcc800924925855df5dcb2cb8ee5263ded3fd84c (patch) | |
| tree | e36025ada7d36b4c81adf0d73230e8bd7331ed8e /libavutil/atomic.h | |
| parent | fb2d1b1b136bf71915dcd86ad7da97cb7d8c8e1e (diff) | |
| parent | 5549f693d2181b3211427f65e48eaa2f4fc5a402 (diff) | |
| download | ffmpeg-dcc800924925855df5dcb2cb8ee5263ded3fd84c.tar.gz | |
Merge commit '5549f693d2181b3211427f65e48eaa2f4fc5a402' into release/2.4
* commit '5549f693d2181b3211427f65e48eaa2f4fc5a402':
mjpegenc: Fix JFIF header byte ordering
Conflicts:
libavcodec/mjpegenc_common.c
See: b19313218c32fa9446d474cbddb11c0776868cd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/atomic.h')
0 files changed, 0 insertions, 0 deletions