Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / mlp_parser.h

diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h
index c3d26add4fd548270ce0c4edb7cc7ce4906ac6b6..6e43bc38dc0560c56449f2e8e4f23ba534bb37dd 100644 (file)
--- a/libavcodec/mlp_parser.h
+++ b/libavcodec/mlp_parser.h
@@ -20,14 +20,14 @@
  */
 
 /**
- * @file mlp_parser.h
+ * @file
  * MLP parser prototypes
  */
 
-#ifndef FFMPEG_MLP_PARSER_H
-#define FFMPEG_MLP_PARSER_H
+#ifndef AVCODEC_MLP_PARSER_H
+#define AVCODEC_MLP_PARSER_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct MLPHeaderInfo
 {
@@ -54,6 +54,9 @@ typedef struct MLPHeaderInfo
 
 
 int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb);
+int64_t ff_truehd_layout(int chanmap);
 
-#endif /* FFMPEG_MLP_PARSER_H */
+extern const uint64_t ff_mlp_layout[32];
+
+#endif /* AVCODEC_MLP_PARSER_H */