avio: avformat.h / avio.h are always present

[vlc] / modules / access / avio.h

diff --git a/modules/access/avio.h b/modules/access/avio.h
index 01a864a3023c4c65690ce13279c05287d70aa55a..ae95beea27dfefca15f7608675c41792c2002998 100644 (file)
--- a/modules/access/avio.h
+++ b/modules/access/avio.h
@@ -21,15 +21,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/* ffmpeg header */
-#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
-#   include <libavformat/avformat.h>
-#   if defined(HAVE_LIBAVFORMAT_AVIO_H)
-#      include <libavformat/avio.h>
-#   endif
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-#   include <ffmpeg/avformat.h>
-#endif
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+
 int  OpenAvio (vlc_object_t *);
 void CloseAvio(vlc_object_t *);
 int  OutOpenAvio (vlc_object_t *);