瀏覽代碼

- one more fix for 763

Ivan Savenko 14 年之前
父節點
當前提交
ecf33cca91
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 2 2
      configure
  2. 2 2
      configure.ac

+ 2 - 2
configure

@@ -16461,12 +16461,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_av_register_protocol2" >&5
 $as_echo "$ac_cv_lib_avcodec_av_register_protocol2" >&6; }
 if test "x$ac_cv_lib_avcodec_av_register_protocol2" = x""yes; then :
-  AVCODEC_DECODE_VIDEO2="-DWITH_AV_REGISTER_PROTOCOL2"
+  AV_REGISTER_PROTOCOL2="-DWITH_AV_REGISTER_PROTOCOL2"
 fi
 
 
 FFMPEG_LIBS="$LIBS"
-FFMPEG_CXXFLAGS="$CFLAGS $AVCODEC_DECODE_VIDEO2"
+FFMPEG_CXXFLAGS="$CFLAGS $AVCODEC_DECODE_VIDEO2 $AV_REGISTER_PROTOCOL2"
 
 LIBS=$saved_LIBS
 CFLAGS=$saved_CFLAGS

+ 2 - 2
configure.ac

@@ -92,10 +92,10 @@ CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale`"
 AC_CHECK_LIB(avformat,av_open_input_file,,AC_MSG_ERROR([FFMpeg avformat library not found. Please install it.]))
 AC_CHECK_LIB(swscale,sws_getContext,,AC_MSG_ERROR([FFMpeg swscale library not found. Please install it.]))
 AC_CHECK_LIB(avcodec,avcodec_decode_video2,AVCODEC_DECODE_VIDEO2="-DWITH_AVCODEC_DECODE_VIDEO2",)
-AC_CHECK_LIB(avcodec,av_register_protocol2,AVCODEC_DECODE_VIDEO2="-DWITH_AV_REGISTER_PROTOCOL2",)
+AC_CHECK_LIB(avcodec,av_register_protocol2,AV_REGISTER_PROTOCOL2="-DWITH_AV_REGISTER_PROTOCOL2",)
 
 FFMPEG_LIBS="$LIBS"
-FFMPEG_CXXFLAGS="$CFLAGS $AVCODEC_DECODE_VIDEO2"
+FFMPEG_CXXFLAGS="$CFLAGS $AVCODEC_DECODE_VIDEO2 $AV_REGISTER_PROTOCOL2"
 
 LIBS=$saved_LIBS
 CFLAGS=$saved_CFLAGS