mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
6017c98036
* 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>