Merge commit 'c546147db07d16a76c2fb698d2e8a3057f393475'

[ffmpeg] / libavcodec / dca.h

diff --git a/libavcodec/dca.h b/libavcodec/dca.h
index cf6204e55416d28461f56f30240c5c1a374b305b..172c965b3b412fa80aa9aa70a2a77b4b88fde3fd 100644 (file)
--- a/libavcodec/dca.h
+++ b/libavcodec/dca.h
@@ -45,7 +45,8 @@ enum DCAParseError {
     DCA_PARSE_ERROR_SAMPLE_RATE     = -6,
     DCA_PARSE_ERROR_RESERVED_BIT    = -7,
     DCA_PARSE_ERROR_LFE_FLAG        = -8,
-    DCA_PARSE_ERROR_PCM_RES         = -9
+    DCA_PARSE_ERROR_PCM_RES         = -9,
+    DCA_PARSE_ERROR_INVALIDDATA     = -10,
 };
 
 typedef struct DCACoreFrameHeader {
@@ -212,6 +213,8 @@ int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
  * Parse and validate core frame header
  * @return 0 on success, negative DCA_PARSE_ERROR_ code on failure
  */
-int avpriv_dca_parse_core_frame_header(GetBitContext *gb, DCACoreFrameHeader *h);
+int avpriv_dca_parse_core_frame_header(DCACoreFrameHeader *h, uint8_t *buf, int size);
+
+int ff_dca_parse_core_frame_header(DCACoreFrameHeader *h, GetBitContext *gb);
 
 #endif /* AVCODEC_DCA_H */