Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'

* commit '25f613f8be3b51e4396b93cda131e4631ba54302':
  dca: Move syncword definitions to a separate header

Conflicts:
	libavcodec/dca_parser.c
	libavformat/dtsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 37 insertions, 0 deletions

diff --git a/libavcodec/dca_syncwords.h b/libavcodec/dca_syncwords.h
new file mode 100644
index 0000000000..24f43a47f9
--- /dev/null
+++ b/libavcodec/dca_syncwords.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_DCA_SYNCWORDS_H
+#define AVCODEC_DCA_SYNCWORDS_H
+
+enum DCASyncwords {
+    DCA_SYNCWORD_CORE_BE        = 0x7FFE8001,
+    DCA_SYNCWORD_CORE_LE        = 0xFE7F0180,
+    DCA_SYNCWORD_CORE_14B_BE    = 0x1FFFE800,
+    DCA_SYNCWORD_CORE_14B_LE    = 0xFF1F00E8,
+    DCA_SYNCWORD_XCH            = 0x5A5A5A5A,
+    DCA_SYNCWORD_XXCH           = 0x47004A03,
+    DCA_SYNCWORD_X96            = 0x1D95F262,
+    DCA_SYNCWORD_XBR            = 0x655E315E,
+    DCA_SYNCWORD_LBR            = 0x0A801921,
+    DCA_SYNCWORD_XLL            = 0x41A29547,
+    DCA_SYNCWORD_SUBSTREAM      = 0x64582025,
+    DCA_SYNCWORD_SUBSTREAM_CORE = 0x02B09261,
+};
+
+#endif /* AVCODEC_DCA_SYNCWORDS_H */