diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:27:58 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:27:58 +0300 |
commit | 6f199ab3d97a1a5831f261fd5fc46d592ae1cdff (patch) | |
tree | a785da88f8fc1ffd73619d528bfac70a795d2f51 /libmpdemux | |
parent | 18657beb190b3e4acc6404c3b87e6eafbd22de3c (diff) | |
parent | 8c9cb24a48373330e9bfd4568eb7987890b19f8f (diff) | |
download | mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.bz2 mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.xz |
Merge svn changes up to r31169
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/muxer_mpeg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 55e2923a13..daa1f98a0a 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -37,7 +37,10 @@ #include "aac_hdr.h" #include "mpeg_hdr.h" #include "mp3_hdr.h" -#include "liba52/a52.h" + +#ifdef CONFIG_LIBA52 +#include <a52dec/a52.h> +#endif #define PACK_HEADER_START_CODE 0x01ba #define SYSTEM_HEADER_START_CODE 0x01bb |