|
|
@ -491,11 +491,11 @@ bool CvCapture_FFMPEG::open( const char* _filename ) |
|
|
|
AVCodecContext *enc = &ic->streams[i]->codec; |
|
|
|
AVCodecContext *enc = &ic->streams[i]->codec; |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
avcodec_thread_init(enc, count_threads); |
|
|
|
avcodec_thread_init(enc, count_threads); |
|
|
|
|
|
|
|
|
|
|
|
//#ifndef AVMEDIA_TYPE_VIDEO
|
|
|
|
#ifndef AVMEDIA_TYPE_VIDEO |
|
|
|
// #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
|
|
|
|
#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO |
|
|
|
//#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); |
|
|
|