[FFmpeg-cvslog] Merge commit '5549f693d2181b3211427f65e48eaa2f4fc5a402' into release/2.4
Michael Niedermayer
git at videolan.org
Tue May 19 22:09:16 CEST 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 22:01:43 2015 +0200| [dcc800924925855df5dcb2cb8ee5263ded3fd84c] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcc800924925855df5dcb2cb8ee5263ded3fd84c
---
More information about the ffmpeg-cvslog
mailing list