ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed
Jul 22 17:26:37 2015 +0200| [05cf687d130a976d96051f6f6bdb63cf724d3709] |
committer: Michael Niedermayer
Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'
* commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c':
dds: Fix palette decoding
Conflicts:
libavcodec/dds.c
See: 36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05cf687d130a976d96051f6f6bdb63cf724d3709
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
