]> git.sesse.net Git - ffmpeg/commit
Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 May 2013 09:13:46 +0000 (11:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 May 2013 09:13:46 +0000 (11:13 +0200)
commitdce12f694864454c5e5a987bd3fa808e66268af4
treeca5563161729521bf27d6cffa5340eed9e29f1c0
parent2060d944090f10fb60e5c0ac42b7a946b9d5859f
parent9cfa21c8c2b81146aab574f55c93f27e5c2d435c
Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/utils.c