[FFmpeg-cvslog] Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'
Michael Niedermayer
git at videolan.org
Tue Jul 1 13:41:14 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 1 13:12:02 2014 +0200| [909f53f2b285bc7dbe77d4690a03f3d114417297] | committer: Michael Niedermayer
Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'
* commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30':
mjpeg: Split off bits shared by MJPEG and LJPEG encoders
Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=909f53f2b285bc7dbe77d4690a03f3d114417297
---
More information about the ffmpeg-cvslog
mailing list