[vlc-commits] commit: AVIO: fix compilation when avio.h is separated from avformat.h ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Nov 11 20:54:01 2010 +0100| [267a1b7a8062b3545b1063def3b0c7738d8d2460] | committer: Jean-Baptiste Kempf 

AVIO: fix compilation when avio.h is separated from avformat.h

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=267a1b7a8062b3545b1063def3b0c7738d8d2460
---

 configure.ac          |    2 +-
 modules/access/avio.h |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5113ca9..0ce7a88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2769,7 +2769,7 @@ then
       VLC_SAVE_FLAGS
       CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
       CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}"
-      AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h)
+      AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h libavformat/avio.h)
       AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
       AS_IF([test "$enable_merge_ffmpeg" = "no"], [
         VLC_ADD_PLUGIN([avformat access_avio])
diff --git a/modules/access/avio.h b/modules/access/avio.h
index 7e956d0..f744e8a 100644
--- a/modules/access/avio.h
+++ b/modules/access/avio.h
@@ -24,6 +24,9 @@
 /* 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