Commit 845454bb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent 71591744
......@@ -2648,7 +2648,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])
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment