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-fieldorder | |
| parent | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (diff) | |
| parent | 92b099daf4b8ef93513e38b43899cb8458a2fde3 (diff) | |
| download | ffmpeg-streaming-ed962414bd66027ce67ded912c17e08970163f52.zip ffmpeg-streaming-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-fieldorder')
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-fieldorder | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 33f8e41..a7cab2c 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 |
