generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed build ffmpeg v0.8.1

Browse Source
This commit is contained in:
Andrey Morozov 2011-07-31 17:34:31 +00:00
parent a826a983d3
commit c697f6a3f8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@ -493,16 +493,12 @@ bool CvCapture_FFMPEG::open( const char* _filename )
avcodec_thread_init(enc, count_threads); avcodec_thread_init(enc, count_threads);
#if AVMEDIA_TYPE_VIDEO #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 4, 0)
#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
#else
#ifndef AVMEDIA_TYPE_VIDEO
#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
#endif
#endif #endif
if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) { if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
AVCodec *codec = avcodec_find_decoder(enc->codec_id); AVCodec *codec = avcodec_find_decoder(enc->codec_id);
if (!codec || if (!codec ||
avcodec_open(enc, codec) < 0) avcodec_open(enc, codec) < 0)
goto exit_func; goto exit_func;