Skip to content

V
vlc
Commit 267a1b7a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

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

parent 2e57673a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
configure.ac
View file @ 267a1b7a
...@@ -2769,7 +2769,7 @@ then ...@@ -2769,7 +2769,7 @@ then
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
CFLAGS="${CFLAGS} ${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) AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
AS_IF([test "$enable_merge_ffmpeg" = "no"], [ AS_IF([test "$enable_merge_ffmpeg" = "no"], [
VLC_ADD_PLUGIN([avformat access_avio]) VLC_ADD_PLUGIN([avformat access_avio])
......
modules/access/avio.h
View file @ 267a1b7a
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
/* ffmpeg header */ /* ffmpeg header */
#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) #if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
# include <libavformat/avformat.h> # include <libavformat/avformat.h>
# if defined(HAVE_LIBAVFORMAT_AVIO_H)
# include <libavformat/avio.h>
# endif
#elif defined(HAVE_FFMPEG_AVFORMAT_H) #elif defined(HAVE_FFMPEG_AVFORMAT_H)
# include <ffmpeg/avformat.h> # include <ffmpeg/avformat.h>
#endif #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