1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +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
115e63c8d6
8100426fe4
9d30690f20
b828788d58
84efdabc94
c62cb9bf5a
ea93052db3
faa94a576f

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-28 14:04:32 -03:00
commit 4205e20c22

Diff Content Not Available