Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 01:20:52 +0000 (03:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 01:36:38 +0000 (03:36 +0200)
commited962414bd66027ce67ded912c17e08970163f52
tree27a07264d5e7d5194c9a2df07882b8cdb75790a3
parent0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb
parent92b099daf4b8ef93513e38b43899cb8458a2fde3
Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
  swscale: support converting YVYU422 pixel format

Conflicts:
libswscale/input.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libswscale/input.c
libswscale/output.c
libswscale/swscale_internal.h
libswscale/utils.c
tests/ref/fate/filter-pixdesc
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-field
tests/ref/fate/filter-pixfmts-fieldorder
tests/ref/fate/filter-pixfmts-il
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip