[FFmpeg-cvslog] Merge commit '85ca012ba680bdf942d95ab98c74f6a28f447588'

Michael Niedermayer git at videolan.org
Wed May 13 22:25:44 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 13 22:18:08 2015 +0200| [3bf81d389638199ebdbe8f2d302b4c2a7f6563d2] | committer: Michael Niedermayer

Merge commit '85ca012ba680bdf942d95ab98c74f6a28f447588'

* commit '85ca012ba680bdf942d95ab98c74f6a28f447588':
  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=3bf81d389638199ebdbe8f2d302b4c2a7f6563d2
---





More information about the ffmpeg-cvslog mailing list