fixed build ffmpeg v0.8.1

14 years ago · c697f6a3f8
parent a826a983d3
commit c697f6a3f8
1 changed files with 3 additions and 7 deletions
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@ -493,12 +493,8 @@ bool CvCapture_FFMPEG::open( const char* _filename )

        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
-        #else
-	    #ifndef AVMEDIA_TYPE_VIDEO
-                #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
-	    #endif
        #endif
        
        if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {