Merge pull request #12859 from janisozaur:empty-block

842341fc · Alexander Alekhin · 32a5e5fa · 5640b36f · 842341fc
Commit 842341fc authored Oct 17, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

cap_ffmpeg_impl.hpp modules/videoio/src/cap_ffmpeg_impl.hpp +0 -2

No files found.
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@@ -1519,8 +1519,6 @@ static AVFrame * icv_alloc_picture_FFMPEG(int pix_fmt, int width, int height, bo
        _opencv_ffmpeg_av_image_fill_arrays(picture, picture_buf,
                       (AVPixelFormat) pix_fmt, width, height);
    }
-    else {
-    }

    return picture;
 }