diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2013-05-17 08:07:35 -0400 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-05-17 08:07:35 -0400 |
| commit | a760994787d7316a25d85e1883ac494520108e33 (patch) | |
| tree | 17a8cb56ec900e8d7d0194b074c4f3279bd5ffa7 /lib | |
| parent | 45c447a48cb29542c7467a87d4710cb839ad055e (diff) | |
Remove the check for libavutil/samplefmt.h and assume it is always present.
This header has existed since libavcore got merged back into libavutil and xbmc will not build with such an old ffmpeg version that does not have it.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/DllAvUtil.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h index aaa5633275..783ca2a92c 100644 --- a/lib/DllAvUtil.h +++ b/lib/DllAvUtil.h @@ -40,8 +40,6 @@ extern "C" { #include <libavutil/audioconvert.h> #include <libavutil/crc.h> #include <libavutil/fifo.h> - // for enum AVSampleFormat - #include <libavutil/samplefmt.h> // for LIBAVCODEC_VERSION_INT: #include <libavcodec/avcodec.h> #elif (defined HAVE_FFMPEG_AVUTIL_H) @@ -50,11 +48,11 @@ extern "C" { #include <ffmpeg/audioconvert.h> #include <ffmpeg/crc.h> #include <ffmpeg/fifo.h> - // for enum AVSampleFormat - #include <ffmpeg/samplefmt.h> // for LIBAVCODEC_VERSION_INT: #include <ffmpeg/avcodec.h> #endif + // for enum AVSampleFormat + #include <libavutil/samplefmt.h> #include <libavutil/opt.h> #include <libavutil/mem.h> #include <libavutil/mathematics.h> |