diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-23 10:33:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-23 10:33:45 +0200 |
| commit | 1fded9b69cc7af81fbc9ebd957a35e5d544eafb4 (patch) | |
| tree | d035cf42e079c100cd5695387d21653a83721499 /libavcodec/aandcttab.h | |
| parent | 1724123c65b55ec3a6d7a8b2236f9d71b4129132 (diff) | |
| parent | f36d7831d96aeb072db5a2b78892a534d96e288e (diff) | |
| download | ffmpeg-1fded9b69cc7af81fbc9ebd957a35e5d544eafb4.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/aandcttab.h')
0 files changed, 0 insertions, 0 deletions