[FFmpeg-cvslog] Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'
Michael Niedermayer
git at videolan.org
Thu May 23 10:40:13 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 23 10:33:45 2013 +0200| [1fded9b69cc7af81fbc9ebd957a35e5d544eafb4] | committer: Michael Niedermayer
Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'
* commit 'f36d7831d96aeb072db5a2b78892a534d96e288e':
pixdesc: mark gray8 as pseudopal
Conflicts:
libavutil/pixdesc.c
No change as gray8 was already marked as pseudopal in FFmpeg
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fded9b69cc7af81fbc9ebd957a35e5d544eafb4
---
More information about the ffmpeg-cvslog
mailing list