Skip to content

O
opencv
Commit 418bc6db authored by Andrey Morozov's avatar Andrey Morozov
Browse files
Options

minor fix for ffmpeg

parent 750c56cc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/highgui/src/cap_ffmpeg_impl.hpp
View file @ 418bc6db
...@@ -491,11 +491,11 @@ bool CvCapture_FFMPEG::open( const char* _filename ) ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment