mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-08-12 12:14:38 +00:00
* commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4': pixdesc: return color properties names Conflicts: libavutil/pixdesc.c libavutil/pixdesc.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
84 KiB
84 KiB