mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-05-12 05:52:42 +02:00
4cf4da9dc5
* commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>