Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Aug 2014 10:51:46 +0000 (10:51 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Aug 2014 10:51:46 +0000 (10:51 +0000)
1  2 
modules/videoio/src/cap_pvapi.cpp

Simple merge