Merge pull request #11481 from dapicard:11480-allow_to_force_video_codec_ffmpeg

7 years ago · 2025650d50
parent 107b3f328b ba000bf8ea
commit 2025650d50
1 changed files with 6 additions and 1 deletions
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@ -870,7 +870,12 @@ bool CvCapture_FFMPEG::open( const char* _filename )
            int enc_width = enc->width;
            int enc_height = enc->height;

-            AVCodec *codec = avcodec_find_decoder(enc->codec_id);
+            AVCodec *codec;
+            if(av_dict_get(dict, "video_codec", NULL, 0) == NULL) {
+                codec = avcodec_find_decoder(enc->codec_id);
+            } else {
+                codec = avcodec_find_decoder_by_name(av_dict_get(dict, "video_codec", NULL, 0)->value);
+            }
            if (!codec ||
 #if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
                avcodec_open2(enc, codec, NULL)