mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-17 15:20:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11481 from dapicard:11480-allow_to_force_video_codec_ffmpeg

Browse Source
This commit is contained in:
Alexander Alekhin 2018-05-09 10:36:48 +00:00
commit 2025650d50
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/videoio/src/cap_ffmpeg_impl.hpp
View File

@ -870,7 +870,12 @@ bool CvCapture_FFMPEG::open( const char* _filename )
int enc_width = enc->width; int enc_width = enc->width;
int enc_height = enc->height; 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 (!codec ||
#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0) #if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
avcodec_open2(enc, codec, NULL) avcodec_open2(enc, codec, NULL)