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 | |
| parent | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (diff) | |
| parent | 92b099daf4b8ef93513e38b43899cb8458a2fde3 (diff) | |
| download | ffmpeg-ed962414bd66027ce67ded912c17e08970163f52.tar.gz | |
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')
| -rw-r--r-- | tests/ref/fate/filter-pixdesc | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-copy | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-field | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-fieldorder | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-il | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-null | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-scale | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-vflip | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/tests/ref/fate/filter-pixdesc b/tests/ref/fate/filter-pixdesc index 7b652940eb..da4dffe031 100644 --- a/tests/ref/fate/filter-pixdesc +++ b/tests/ref/fate/filter-pixdesc @@ -115,3 +115,4 @@ yuvj422p aa97862b57f47c5a6506156e9aaf129a yuvj440p ff8b9884a49d546b035f5d2ac1e673df yuvj444p b8142888d80b8065c54045839e79b331 yuyv422 f06a4fbbdb32807d05de825daa2c3a1b +yvyu422 168d69661ced61f5f58cca8977d99cb3 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 4fa4a06ce5..95f7f3a298 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -116,3 +116,4 @@ yuvj422p aa97862b57f47c5a6506156e9aaf129a yuvj440p ff8b9884a49d546b035f5d2ac1e673df yuvj444p b8142888d80b8065c54045839e79b331 yuyv422 f06a4fbbdb32807d05de825daa2c3a1b +yvyu422 168d69661ced61f5f58cca8977d99cb3 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 75333fd02d..00fd3e155d 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -116,3 +116,4 @@ yuvj422p 8cec955c1c62b00b6798361ef82962b7 yuvj440p 7b469444994d8b52766ee461bcb795ea yuvj444p b395162325af489c465a3e6a31fbb0e7 yuyv422 1efb17cd0a48d2e956fd574ea6f412e7 +yvyu422 e3f928a98fb7e67c7d77d2a6a4eb0a24 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 33f8e41205..a7cab2cdca 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -89,3 +89,4 @@ yuvj411p 09f79c56109a13eefb68ee729d9a624b yuvj422p 942043a34ac7d0f65edced1f6361259c yuvj444p 7e4758df8eb9b18ad60e1b69a913f8c8 yuyv422 6b0c70d5ebf1685857b65456c547ea1c +yvyu422 c19796b4f14fe72bbb5bbefa3566f444 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 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 4fa4a06ce5..95f7f3a298 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -116,3 +116,4 @@ yuvj422p aa97862b57f47c5a6506156e9aaf129a yuvj440p ff8b9884a49d546b035f5d2ac1e673df yuvj444p b8142888d80b8065c54045839e79b331 yuyv422 f06a4fbbdb32807d05de825daa2c3a1b +yvyu422 168d69661ced61f5f58cca8977d99cb3 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index a2e942df0c..0b4de4ec75 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -116,3 +116,4 @@ yuvj422p 492452e50a3fe66724840cad29be4098 yuvj440p 7632893e81d3f4f3ace3755f97479897 yuvj444p 389388dd5d623f660c30ab840807ce82 yuyv422 518be9b5ac93c365c0962453770fbe73 +yvyu422 bd9cfd830d357321864836f1afdf2e36 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index cc3d68cf04..0ebd19e5e7 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -116,3 +116,4 @@ yuvj422p a19a89ef145305cf224ef5aa247d075a yuvj440p 4240c9348d28af5f3edd0e642002bd2c yuvj444p 9e11298ba9c4faae0f5c81420d2123f2 yuyv422 867fff568fa4170503779c48e5f25e6e +yvyu422 074a44d1d74c4417f70290f6b31bdf2e |