dbus: UpdateCaps is now always called with the playlist unlocked.

[vlc] / modules / demux / mp4 / libmp4.h

diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index ec1b899a8a92abc3e34b45ccec502e3300b720b1..a4e786d4477c41181182b3ded605f43e2fad5aca 100644 (file)
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -118,6 +118,8 @@
 #define FOURCC_sawb VLC_FOURCC( 's', 'a', 'w', 'b' )
 #define FOURCC_OggS VLC_FOURCC( 'O', 'g', 'g', 'S' )
 #define FOURCC_alac VLC_FOURCC( 'a', 'l', 'a', 'c' )
+#define FOURCC_dac3 VLC_FOURCC( 'd', 'a', 'c', '3' )
+#define FOURCC_dec3 VLC_FOURCC( 'd', 'e', 'c', '3' )
 
 #define FOURCC_zlib VLC_FOURCC( 'z', 'l', 'i', 'b' )
 #define FOURCC_SVQ1 VLC_FOURCC( 'S', 'V', 'Q', '1' )
@@ -187,6 +189,7 @@
 #define FOURCC_text VLC_FOURCC( 't', 'e', 'x', 't' )
 #define FOURCC_tx3g VLC_FOURCC( 't', 'x', '3', 'g' )
 #define FOURCC_subp VLC_FOURCC( 's', 'u', 'b', 'p' )
+#define FOURCC_sbtl VLC_FOURCC( 's', 'b', 't', 'l' )
 
 #define FOURCC_0xa9nam VLC_FOURCC( 0xa9, 'n', 'a', 'm' )
 #define FOURCC_0xa9aut VLC_FOURCC( 0xa9, 'a', 'u', 't' )
@@ -858,6 +861,17 @@ typedef struct
 
 } MP4_Box_data_avcC_t;
 
+typedef struct
+{
+    uint8_t i_fscod;
+    uint8_t i_bsid;
+    uint8_t i_bsmod;
+    uint8_t i_acmod;
+    uint8_t i_lfeon;
+    uint8_t i_bitrate_code;
+
+} MP4_Box_data_dac3_t;
+
 /*
 typedef struct MP4_Box_data__s
 {
@@ -891,6 +905,7 @@ typedef union MP4_Box_data_s
 
         MP4_Box_data_esds_t *p_esds;
         MP4_Box_data_avcC_t *p_avcC;
+        MP4_Box_data_dac3_t *p_dac3;
 
     MP4_Box_data_stsz_t *p_stsz;
     MP4_Box_data_stz2_t *p_stz2;