[FFmpeg-cvslog] Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'
Michael Niedermayer
git at videolan.org
Tue May 21 11:33:42 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 21 11:25:46 2013 +0200| [3b071a4390f02ecbeb993f16f93b01f4e420def8] | committer: Michael Niedermayer
Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'
* commit 'a030279a67ef883df8cf3707774656fa1be81078':
ljpeg: use the correct number of components in yuv
Conflicts:
libavcodec/mjpegdec.c
See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b071a4390f02ecbeb993f16f93b01f4e420def8
---
More information about the ffmpeg-cvslog
mailing list