diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:53:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:53:48 +0200 |
| commit | bb44f7d5d7e48bd67fa24fbec4a28f9890e444aa (patch) | |
| tree | 863b54eb4dd13a87d11869ac64730be4ed9c2397 /libswresample/x86 | |
| parent | 7eb959bf0b961e308e3068f161ee94e82e02355d (diff) | |
| parent | 5a419b2dd1881889d436f55741fd3ff3f9f436c4 (diff) | |
| download | ffmpeg-bb44f7d5d7e48bd67fa24fbec4a28f9890e444aa.tar.gz | |
Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'
* commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4':
pixdesc: return color properties names
Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86')
0 files changed, 0 insertions, 0 deletions