Merge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 02:15:59 +0000 (04:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 02:16:35 +0000 (04:16 +0200)
* commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b':
  fate: update tests for YVYU422 pixel format

Conflicts:
tests/ref/fate/filter-pixdesc
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip

No change as the fate tests where updated in the merges that changed
the scores

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge