Merge pull request #6199 from alalek:ffmpeg_backport

ea049e14 · Alexander Alekhin · 60f73eee · a61b19b5 · ea049e14
Commit ea049e14 authored Mar 03, 2016 by Alexander Alekhin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

cap_ffmpeg_impl.hpp modules/highgui/src/cap_ffmpeg_impl.hpp +0 -0

No files found.
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp