[FFmpeg-cvslog] Merge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 04:15:59 2014 +0200| [e40d92b1e48d0baa0ded33b51886c392e8d5235a] | committer: Michael Niedermayer

Merge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e40d92b1e48d0baa0ded33b51886c392e8d5235a
---