[FFmpeg-cvslog] Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa'

Michael Niedermayer git at videolan.org
Fri Aug 16 11:49:48 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 11:43:26 2013 +0200| [15677e72399d12911128e7109a7e4101226f48d6] | committer: Michael Niedermayer

Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa'

* commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa':
  8bps: decode 24bit files correctly as rgb32 on bigendian

Conflicts:
	libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15677e72399d12911128e7109a7e4101226f48d6
---





More information about the ffmpeg-cvslog mailing list