mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
Merge commit '378460fef1e563704bc5a307ba748a2b819cc09d'
* commit '378460fef1e563704bc5a307ba748a2b819cc09d': utvideodec: Support for gradient prediction utvideodec: Reuse the huffyuv add_left utvideodec: Support ULY4 and ULH4 utvideodec: Support UQRA and UQRG swscale: Add gbrap10 output swscale: Add input support for gbrap10 pixel format pixfmt: Add gbrap10 pixel format utvideodec: Support UQY2 This commit is a noop, see 115e63c8d6791ebdc921caf40c3def024690af2e 8100426fe4ba41b74404cbbd83184afa3239f64b 9d30690f20343ed3057fe4abf82009598d320ce5 b828788d58cb6f55e0bffa4682d75ddf84b4214b 84efdabc94251f1f6f483eb737e95d53376ae921 c62cb9bf5a50df416532afd8d5f79ebade174ac7 ea93052db3594f93f2d10be085a770184da0513d faa94a576f5f3de10fc7016e0d94229faa1c2159 Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
4205e20c22