Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Dec 2014 00:29:53 +0000 (01:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Dec 2014 00:30:08 +0000 (01:30 +0100)
commite827f65618f601ae2016e6f8ac8851534ed346c8
treea593205f1c9b6de0e9468f3c237d86d230301c7d
parent95482092b1e57987e079cd94b06e875f4d19d762
parent33c827f632f95ffe3399b695a5a0d47b366b6e20
Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'

* commit '33c827f632f95ffe3399b695a5a0d47b366b6e20':
  swscale: Properly scale YUV

Conflicts:
libswscale/swscale_unscaled.c
tests/ref/fate/filter-pixdesc-yuv420p10be
tests/ref/fate/filter-pixdesc-yuv420p10le
tests/ref/fate/filter-pixdesc-yuv420p9be
tests/ref/fate/filter-pixdesc-yuv420p9le
tests/ref/fate/filter-pixdesc-yuva420p10be
tests/ref/fate/filter-pixdesc-yuva420p10le
tests/ref/fate/filter-pixdesc-yuva420p9be
tests/ref/fate/filter-pixdesc-yuva420p9le
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip

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