Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / dca.h

diff --git a/libavcodec/dca.h b/libavcodec/dca.h
index e2197a4408795c9fb01a322e5ab54b43d6d6baec..02c0a51ea844fec09163f22ba877edbb20ad8287 100644 (file)
--- a/libavcodec/dca.h
+++ b/libavcodec/dca.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_DCA_H
-#define FFMPEG_DCA_H
+#ifndef AVCODEC_DCA_H
+#define AVCODEC_DCA_H
 
 /** DCA syncwords, also used for bitstream type detection */
 #define DCA_MARKER_RAW_BE 0x7FFE8001
@@ -31,4 +31,7 @@
 #define DCA_MARKER_14B_BE 0x1FFFE800
 #define DCA_MARKER_14B_LE 0xFF1F00E8
 
-#endif /* FFMPEG_DCA_H */
+/** DCA-HD specific block starts with this marker. */
+#define DCA_HD_MARKER     0x64582025
+
+#endif /* AVCODEC_DCA_H */