Merge commit '2fb02ecf'
* commit '2fb02ecf': fate: Reduce the number of frames used to test video filters Conflicts: tests/fate-run.sh tests/ref/fate/filter-crop tests/ref/fate/filter-crop_scale tests/ref/fate/filter-crop_scale_vflip tests/ref/fate/filter-crop_vflip tests/ref/fate/filter-null tests/ref/fate/filter-pixdesc-abgr tests/ref/fate/filter-pixdesc-argb tests/ref/fate/filter-pixdesc-bgr24 tests/ref/fate/filter-pixdesc-bgr444be tests/ref/fate/filter-pixdesc-bgr444le tests/ref/fate/filter-pixdesc-bgr48be tests/ref/fate/filter-pixdesc-bgr48le tests/ref/fate/filter-pixdesc-bgr4_byte tests/ref/fate/filter-pixdesc-bgr555be tests/ref/fate/filter-pixdesc-bgr555le tests/ref/fate/filter-pixdesc-bgr565be tests/ref/fate/filter-pixdesc-bgr565le tests/ref/fate/filter-pixdesc-bgr8 tests/ref/fate/filter-pixdesc-bgra tests/ref/fate/filter-pixdesc-gbrap tests/ref/fate/filter-pixdesc-gbrp tests/ref/fate/filter-pixdesc-gbrp10be tests/ref/fate/filter-pixdesc-gbrp10le tests/ref/fate/filter-pixdesc-gbrp9be tests/ref/fate/filter-pixdesc-gbrp9le tests/ref/fate/filter-pixdesc-gray tests/ref/fate/filter-pixdesc-gray16be tests/ref/fate/filter-pixdesc-gray16le tests/ref/fate/filter-pixdesc-monob tests/ref/fate/filter-pixdesc-monow tests/ref/fate/filter-pixdesc-nv12 tests/ref/fate/filter-pixdesc-nv21 tests/ref/fate/filter-pixdesc-rgb24 tests/ref/fate/filter-pixdesc-rgb444be tests/ref/fate/filter-pixdesc-rgb444le tests/ref/fate/filter-pixdesc-rgb48be tests/ref/fate/filter-pixdesc-rgb48le tests/ref/fate/filter-pixdesc-rgb4_byte tests/ref/fate/filter-pixdesc-rgb555be tests/ref/fate/filter-pixdesc-rgb555le tests/ref/fate/filter-pixdesc-rgb565be tests/ref/fate/filter-pixdesc-rgb565le tests/ref/fate/filter-pixdesc-rgb8 tests/ref/fate/filter-pixdesc-rgba tests/ref/fate/filter-pixdesc-uyvy422 tests/ref/fate/filter-pixdesc-yuv410p tests/ref/fate/filter-pixdesc-yuv411p tests/ref/fate/filter-pixdesc-yuv420p tests/ref/fate/filter-pixdesc-yuv420p10be tests/ref/fate/filter-pixdesc-yuv420p10le tests/ref/fate/filter-pixdesc-yuv420p16be tests/ref/fate/filter-pixdesc-yuv420p16le tests/ref/fate/filter-pixdesc-yuv420p9be tests/ref/fate/filter-pixdesc-yuv420p9le tests/ref/fate/filter-pixdesc-yuv422p tests/ref/fate/filter-pixdesc-yuv422p10be tests/ref/fate/filter-pixdesc-yuv422p10le tests/ref/fate/filter-pixdesc-yuv422p16be tests/ref/fate/filter-pixdesc-yuv422p16le tests/ref/fate/filter-pixdesc-yuv422p9be tests/ref/fate/filter-pixdesc-yuv422p9le tests/ref/fate/filter-pixdesc-yuv440p tests/ref/fate/filter-pixdesc-yuv444p tests/ref/fate/filter-pixdesc-yuv444p10be tests/ref/fate/filter-pixdesc-yuv444p10le tests/ref/fate/filter-pixdesc-yuv444p16be tests/ref/fate/filter-pixdesc-yuv444p16le tests/ref/fate/filter-pixdesc-yuv444p9be tests/ref/fate/filter-pixdesc-yuv444p9le tests/ref/fate/filter-pixdesc-yuva420p tests/ref/fate/filter-pixdesc-yuva420p10be tests/ref/fate/filter-pixdesc-yuva420p10le tests/ref/fate/filter-pixdesc-yuva420p16be tests/ref/fate/filter-pixdesc-yuva420p16le tests/ref/fate/filter-pixdesc-yuva420p9be tests/ref/fate/filter-pixdesc-yuva420p9le tests/ref/fate/filter-pixdesc-yuva422p tests/ref/fate/filter-pixdesc-yuva422p10be tests/ref/fate/filter-pixdesc-yuva422p10le tests/ref/fate/filter-pixdesc-yuva422p16be tests/ref/fate/filter-pixdesc-yuva422p16le tests/ref/fate/filter-pixdesc-yuva422p9be tests/ref/fate/filter-pixdesc-yuva422p9le tests/ref/fate/filter-pixdesc-yuva444p tests/ref/fate/filter-pixdesc-yuva444p10be tests/ref/fate/filter-pixdesc-yuva444p10le tests/ref/fate/filter-pixdesc-yuva444p16be tests/ref/fate/filter-pixdesc-yuva444p16le tests/ref/fate/filter-pixdesc-yuva444p9be tests/ref/fate/filter-pixdesc-yuva444p9le tests/ref/fate/filter-pixdesc-yuvj420p tests/ref/fate/filter-pixdesc-yuvj422p tests/ref/fate/filter-pixdesc-yuvj440p tests/ref/fate/filter-pixdesc-yuvj444p tests/ref/fate/filter-pixdesc-yuyv422 tests/ref/fate/filter-pixdesc-yvyu422 tests/ref/fate/filter-pixfmts-copy tests/ref/fate/filter-pixfmts-crop tests/ref/fate/filter-pixfmts-hflip tests/ref/fate/filter-pixfmts-null tests/ref/fate/filter-pixfmts-pad tests/ref/fate/filter-pixfmts-scale tests/ref/fate/filter-pixfmts-vflip tests/ref/fate/filter-scale200 tests/ref/fate/filter-scale500 tests/ref/fate/filter-vflip tests/ref/fate/filter-vflip_crop tests/ref/fate/filter-vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please
register
or
sign in
to comment