fixed compile warnings; hopefully fixed test failures
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 22 Apr 2015 21:39:44 +0000 (00:39 +0300)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 9 Jun 2015 12:53:08 +0000 (15:53 +0300)
commit3d6413cfc617627bff518931c2534bf51f90a2d9
treeecc3a47423b4d62a866a92f6e4fe97c7ab13eac0
parent799622affd8baa2d503dd632e1629d60d7ac46b2
fixed compile warnings; hopefully fixed test failures

(cherry picked from commit 30912b49f3514895efbc597da89e6421bf08e60b)

Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/highgui/src/cap_ffmpeg_impl.hpp
modules/highgui/src/ffmpeg_codecs.hpp