diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:33:07 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:33:29 +0200 |
commit | 0b25261d29c6b348e2dccc2985090cf10a60c34f (patch) | |
tree | 3798257fc3502fffffd3913451f739fee1d33656 /libswscale/x86/Makefile | |
parent | 073c074447c253111790c0472fb83f184e66814e (diff) | |
parent | e0d73fda361729d207e51fa2afd8ba6102e58d98 (diff) | |
download | ffmpeg-0b25261d29c6b348e2dccc2985090cf10a60c34f.tar.gz |
Merge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'
* commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98':
avutil: add alias names for gray 8/16 colour spaces
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/Makefile')
0 files changed, 0 insertions, 0 deletions