(linux) configure fix.

configure

@@ -16286,7 +16286,7 @@ FFMPEG_CXXFLAGS=""
 FFMPEG_LIBS=
 
 LIBS="$LIBS `pkg-config --libs libavformat libswscale`"
-CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale` $AVCODEC_DECODE_VIDEO2"
+CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale`"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5
 $as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
@@ -16424,7 +16424,7 @@ fi
 
 
 FFMPEG_LIBS="$LIBS"
-FFMPEG_CXXFLAGS="$CFLAGS"
+FFMPEG_CXXFLAGS="$CFLAGS $AVCODEC_DECODE_VIDEO2"
 
 LIBS=$saved_LIBS
 CFLAGS=$saved_CFLAGS

configure.ac

@@ -87,14 +87,14 @@ FFMPEG_CXXFLAGS=""
 FFMPEG_LIBS=
 
 LIBS="$LIBS `pkg-config --libs libavformat libswscale`"
-CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale` $AVCODEC_DECODE_VIDEO2"
+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",)
 
 FFMPEG_LIBS="$LIBS"
-FFMPEG_CXXFLAGS="$CFLAGS"
+FFMPEG_CXXFLAGS="$CFLAGS $AVCODEC_DECODE_VIDEO2"
 
 LIBS=$saved_LIBS
 CFLAGS=$saved_CFLAGS