diff --git a/configure b/configure
index 4b408e78d..ebf5c5970 100755
--- a/configure
+++ b/configure
@@ -17359,103 +17359,8 @@ else
 fi
 
 
-#check for one of register_protocol functions
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_register_protocol in -lavformat" >&5
-$as_echo_n "checking for av_register_protocol in -lavformat... " >&6; }
-if ${ac_cv_lib_avformat_av_register_protocol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavformat  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char av_register_protocol ();
-int
-main ()
-{
-return av_register_protocol ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_avformat_av_register_protocol=yes
-else
-  ac_cv_lib_avformat_av_register_protocol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_register_protocol" >&5
-$as_echo "$ac_cv_lib_avformat_av_register_protocol" >&6; }
-if test "x$ac_cv_lib_avformat_av_register_protocol" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAVFORMAT 1
-_ACEOF
-
-  LIBS="-lavformat $LIBS"
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_register_protocol2 in -lavformat" >&5
-$as_echo_n "checking for av_register_protocol2 in -lavformat... " >&6; }
-if ${ac_cv_lib_avformat_av_register_protocol2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavformat  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char av_register_protocol2 ();
-int
-main ()
-{
-return av_register_protocol2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_avformat_av_register_protocol2=yes
-else
-  ac_cv_lib_avformat_av_register_protocol2=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_register_protocol2" >&5
-$as_echo "$ac_cv_lib_avformat_av_register_protocol2" >&6; }
-if test "x$ac_cv_lib_avformat_av_register_protocol2" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAVFORMAT 1
-_ACEOF
-
-  LIBS="-lavformat $LIBS"
-
-else
-  DISABLE_VIDEO="-DDISABLE_VIDEO"
-fi
-
-fi
-
-
 FFMPEG_LIBS="$LIBS"
-FFMPEG_CXXFLAGS="$CFLAGS $DISABLE_VIDEO"
+FFMPEG_CXXFLAGS="$CFLAGS"
 
 LIBS=$saved_LIBS
 CFLAGS=$saved_CFLAGS
diff --git a/configure.ac b/configure.ac
index be06c7697..506c145c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,12 +82,8 @@ CFLAGS="$CFLAGS `pkg-config --cflags libavformat libswscale`"
 AC_CHECK_LIB(avformat,av_register_all,,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.]))
 
-#check for one of register_protocol functions
-AC_CHECK_LIB(avformat, av_register_protocol,,
-	AC_CHECK_LIB(avformat, av_register_protocol2,, DISABLE_VIDEO="-DDISABLE_VIDEO")) 
-
 FFMPEG_LIBS="$LIBS"
-FFMPEG_CXXFLAGS="$CFLAGS $DISABLE_VIDEO"
+FFMPEG_CXXFLAGS="$CFLAGS"
 
 LIBS=$saved_LIBS
 CFLAGS=$saved_CFLAGS