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-field | |
| 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/ref/fate/filter-pixfmts-field')
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-field | 1 |
1 files changed, 1 insertions, 0 deletions
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 |