diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 05:23:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 05:24:01 +0100 |
| commit | ada0fc4efa2502c901310faef6b63349e8b6bd6a (patch) | |
| tree | 491f57008a078c48f13071e71d51e9a0db6c111b /libavcodec/dirac.h | |
| parent | 55dc253c24f2160ede1db4f04cfe0692b0b80d05 (diff) | |
| parent | 0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a (diff) | |
| download | ffmpeg-ada0fc4efa2502c901310faef6b63349e8b6bd6a.tar.gz | |
Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'
* commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a':
lavu: add planar 16 bit and 8 bit rgb with alpha
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
See: e6d4e687558d08187e7a415a7725e4b1a416f782
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dirac.h')
0 files changed, 0 insertions, 0 deletions