diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:20:52 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:36:38 +0200 |
commit | ed962414bd66027ce67ded912c17e08970163f52 (patch) | |
tree | 27a07264d5e7d5194c9a2df07882b8cdb75790a3 /tests/ref/fate/filter-pixfmts-il | |
parent | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (diff) | |
parent | 92b099daf4b8ef93513e38b43899cb8458a2fde3 (diff) |
Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'
* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
swscale: support converting YVYU422 pixel format
Conflicts:
libswscale/input.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/filter-pixfmts-il')
-rw-r--r-- | tests/ref/fate/filter-pixfmts-il | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index cd55a1b54c..dadb9e1746 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -115,3 +115,4 @@ yuvj422p d20df6138cdf62d7f3b93eb1277827d6 yuvj440p 17a24a86f279febaebb66d65509088e8 yuvj444p 326bb83d1aec23d941894a1324984c56 yuyv422 f9121733169ca5437e95e7600a7c5aea +yvyu422 d38458e602ed958a262c38d757a7e560 |