[FFmpeg-cvslog] Merge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'
Michael Niedermayer
git at videolan.org
Sun Apr 13 01:46:22 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 01:44:27 2014 +0200| [69505a89f1edcda4191d62149d801da6f48a6c27] | committer: Michael Niedermayer
Merge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'
* commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801':
swscale: Set alpha to opaque for internal palettes.
Conflicts:
libswscale/swscale_unscaled.c
See: dbfdb288c1921eeb9fef5bca20eee33da7fcdd71
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69505a89f1edcda4191d62149d801da6f48a6c27
---
More information about the ffmpeg-cvslog
mailing list