diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
commit | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (patch) | |
tree | 27b3fcc37410ea5f646eb5fc2411406f2cdee175 /libmpcodecs/ad_hwac3.c | |
parent | 259ea9d7034566760785fd5253f97b65ee8cd6ed (diff) | |
parent | 7756839a147ce2421cfb4e3de046364962094b60 (diff) | |
download | mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.bz2 mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.xz |
Merge svn changes up to r27649
Conflicts:
Makefile
configure
libvo/x11_common.c
Diffstat (limited to 'libmpcodecs/ad_hwac3.c')
-rw-r--r-- | libmpcodecs/ad_hwac3.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index 40281528e2..95f072212c 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -17,7 +17,11 @@ #include "ad_internal.h" +#ifdef CONFIG_LIBA52_INTERNAL #include "liba52/a52.h" +#else +#include <a52dec/a52.h> +#endif static int isdts = -1; @@ -97,8 +101,10 @@ static int ac3dts_fillbuff(sh_audio_t *sh_audio) sh_audio->a_in_buffer_len = length; // TODO: is DTS also checksummed? +#ifdef CONFIG_LIBA52_INTERNAL if(isdts == 0 && crc16_block(sh_audio->a_in_buffer + 2, length - 2) != 0) mp_msg(MSGT_DECAUDIO, MSGL_STATUS, "a52: CRC check failed! \n"); +#endif return length; } |