diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-25 10:51:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-25 10:51:19 +0200 |
| commit | 9328ae484338b70a7f2dbcd420bbbac499df76cc (patch) | |
| tree | 5c4dfb7bbbb37243899f75dcb839957d7d003591 /libavutil/file.h | |
| parent | bad8f04b0454441edb0b7a1565e28c0b1a07f7ed (diff) | |
| parent | d9c89ef86b9400e50c2486f9406fad15c85bab22 (diff) | |
| download | ffmpeg-9328ae484338b70a7f2dbcd420bbbac499df76cc.tar.gz | |
Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'
* commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22':
cllc: Use outbuf in RGB and ARGB functions
cllc: Implement YUV support
Conflicts:
libavcodec/cllc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file.h')
0 files changed, 0 insertions, 0 deletions