[FFmpeg-cvslog] Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'
Michael Niedermayer
git at videolan.org
Wed Apr 2 17:51:14 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 2 13:15:04 2014 +0200| [3428a9b8d5ae8ad6d98633f7c4977adbe7c990bd] | committer: Michael Niedermayer
Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'
* commit '0ca0924c10d9617a5793964bf79655424ef32b68':
swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64
Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3428a9b8d5ae8ad6d98633f7c4977adbe7c990bd
---
More information about the ffmpeg-cvslog
mailing list