diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:12:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:12:24 +0200 |
| commit | 6017c98036078283ce3bf4069227fed13f3e0cc0 (patch) | |
| tree | 3e11afe65808350d60e0aaca070d4b7bff8f45fc /libswscale/swscale_internal.h | |
| parent | 4c8bc6fdee95af4cd7a8409dec34756350078b5e (diff) | |
| parent | e9abafca278f87e1ecc6d50091d99b73ff63c9a6 (diff) | |
| download | ffmpeg-6017c98036078283ce3bf4069227fed13f3e0cc0.tar.gz | |
Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'
* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6':
avutil: add AV_PIX_FMT_YA16 pixel format
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
0 files changed, 0 insertions, 0 deletions