ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Mon Jun
1 13:17:37 2015 +0200| [1eb719a3dc71aac2ca3a4e81794d608057e8f2f5] | committer:
Michael Niedermayer
Merge commit '5e886756ee687be5840867d3810991efe17a66c3' into release/2.2
* commit '5e886756ee687be5840867d3810991efe17a66c3':
mjpegenc: Fix JFIF header byte ordering
Conflicts:
libavcodec/mjpegenc.c
See: b19313218c32fa9446d474cbddb11c0776868cd3
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1eb719a3dc71aac2ca3a4e81794d608057e8f2f5
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
