diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:24:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:32:03 +0200 |
| commit | 073c074447c253111790c0472fb83f184e66814e (patch) | |
| tree | 860cb3c06dc2928f2a6daa5086cc60f3cd3b7180 /libavcodec/sunrast.c | |
| parent | 8862c49661fb0655882a78547ca70561f2c5d766 (diff) | |
| parent | d2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26 (diff) | |
| download | ffmpeg-073c074447c253111790c0472fb83f184e66814e.tar.gz | |
Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'
* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26':
pixdesc: Support pixelformat aliases
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sunrast.c')
0 files changed, 0 insertions, 0 deletions