diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-11-01 00:10:30 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-11-01 00:10:30 +0400 |
| commit | 28893779668ec682b0e1f751ad346f4eae1bc8f7 (patch) | |
| tree | 0e4f9be0317df02dbec9ba262ff765244840106d /decoder/LAVAudio | |
| parent | 3658d046e4a7a74f108e7d41ba8c977f1c7282d5 (diff) | |
Move DCA marker defines into the appropriate header file.
Diffstat (limited to 'decoder/LAVAudio')
| -rw-r--r-- | decoder/LAVAudio/LAVAudio.cpp | 1 | ||||
| -rw-r--r-- | decoder/LAVAudio/parser/dts.cpp | 13 | ||||
| -rw-r--r-- | decoder/LAVAudio/parser/dts.h | 13 |
3 files changed, 13 insertions, 14 deletions
diff --git a/decoder/LAVAudio/LAVAudio.cpp b/decoder/LAVAudio/LAVAudio.cpp index 76da6a7e..e70fb94c 100644 --- a/decoder/LAVAudio/LAVAudio.cpp +++ b/decoder/LAVAudio/LAVAudio.cpp @@ -34,7 +34,6 @@ #include "DeCSS/DeCSSInputPin.h" extern "C" { -#include "libavcodec/dca.h" #include "libavformat/spdif.h" extern void ff_rm_reorder_sipr_data(uint8_t *buf, int sub_packet_h, int framesize); diff --git a/decoder/LAVAudio/parser/dts.cpp b/decoder/LAVAudio/parser/dts.cpp index 0f85d658..98389504 100644 --- a/decoder/LAVAudio/parser/dts.cpp +++ b/decoder/LAVAudio/parser/dts.cpp @@ -41,19 +41,6 @@ extern __declspec(dllimport) const uint32_t avpriv_dca_sample_rates[16]; #include <vector> -/** DCA syncwords */ -#define DCA_MARKER_RAW_BE 0x7FFE8001 -#define DCA_MARKER_RAW_LE 0xFE7F0180 -#define DCA_MARKER_14B_BE 0x1FFFE800 -#define DCA_MARKER_14B_LE 0xFF1F00E8 - -/** DCA-HD specific block starts with this marker. */ -#define DCA_HD_MARKER 0x64582025 - -/** DCA extension blocks */ -#define DCA_XCH_MARKER 0x5a5a5a5a -#define DCA_XXCH_MARKER 0x47004A03 - struct DTSParserContext { GetBitContext *gb; }; diff --git a/decoder/LAVAudio/parser/dts.h b/decoder/LAVAudio/parser/dts.h index dd594ebe..2937a563 100644 --- a/decoder/LAVAudio/parser/dts.h +++ b/decoder/LAVAudio/parser/dts.h @@ -21,6 +21,19 @@ #include "parser.h" +/** DCA syncwords */ +#define DCA_MARKER_RAW_BE 0x7FFE8001 +#define DCA_MARKER_RAW_LE 0xFE7F0180 +#define DCA_MARKER_14B_BE 0x1FFFE800 +#define DCA_MARKER_14B_LE 0xFF1F00E8 + +/** DCA-HD specific block starts with this marker. */ +#define DCA_HD_MARKER 0x64582025 + +/** DCA extension blocks */ +#define DCA_XCH_MARKER 0x5a5a5a5a +#define DCA_XXCH_MARKER 0x47004A03 + struct DTSParserContext; struct DTSHeader { |