summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-09 12:28:15 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-09 12:28:15 +0000
commit3921b7170673525a45bbfbc0abc93b401e29f794 (patch)
tree081fc04b9b1fb2ab672ce8dfb5422aeadce2afcc /libmpdemux
parent8d0afdaa88f855deafe97bd94656b300e31ada35 (diff)
downloadmpv-3921b7170673525a45bbfbc0abc93b401e29f794.tar.bz2
mpv-3921b7170673525a45bbfbc0abc93b401e29f794.tar.xz
Use the system liba52 headers when internal liba52 is disabled, fixes:
libmpdemux/muxer_mpeg.c:2121: warning: implicit declaration of function 'a52_syncinfo' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31146 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_mpeg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 7dcbeed784..868c20da43 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -38,7 +38,12 @@
#include "aac_hdr.h"
#include "mpeg_hdr.h"
#include "mp3_hdr.h"
+
+#ifdef CONFIG_LIBA52
+#include <a52dec/a52.h>
+#else
#include "liba52/a52.h"
+#endif
#define PACK_HEADER_START_CODE 0x01ba
#define SYSTEM_HEADER_START_CODE 0x01bb