Merge pull request #7546 from savuor:fix2.4/yuv_channel_order

19e4c772 · Vadim Pisarevsky · f2a59b3d · d23190dc · 19e4c772 · 19e4c772
Commit 19e4c772 authored Jan 31, 2017 by Vadim Pisarevsky
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

color.cpp modules/imgproc/src/color.cpp +0 -0

cvt_color.cl modules/ocl/src/opencl/cvt_color.cl +0 -0

No files found.
--- a/modules/imgproc/src/color.cpp
+++ b/modules/imgproc/src/color.cpp
--- a/modules/ocl/src/opencl/cvt_color.cl
+++ b/modules/ocl/src/opencl/cvt_color.cl