merged all the latest changes from 2.4 to trunk

[platform/upstream/opencv.git] / 3rdparty / lib / libswscale.a

diff --git a/3rdparty/lib/libswscale.a b/3rdparty/lib/libswscale.a
index cb3e777..97dad36 100644 (file)
Binary files a/3rdparty/lib/libswscale.a and b/3rdparty/lib/libswscale.a differ