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

5fb9ef32 · Rafaël Carré · 1eba944c · 5fb9ef32
Commit 5fb9ef32 authored Aug 15, 2013 by Rafaël Carré
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 9 deletions

modules/access/avio.h modules/access/avio.h +3 -9

No files found.
--- 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 *);