diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:24:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:28:53 +0100 |
| commit | 87db7e777262a7800cc6c76e07870f7a8f6301ed (patch) | |
| tree | a9ddb30c4f4408ba8a136f13c84d322ba9ea79b6 /libavcodec/dcadec.c | |
| parent | 634ce8ddad6b2c03d24bce12ba69f9217729d3f5 (diff) | |
| parent | 25f613f8be3b51e4396b93cda131e4631ba54302 (diff) | |
| download | ffmpeg-87db7e777262a7800cc6c76e07870f7a8f6301ed.tar.gz | |
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>
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index d7084634e5..d06e6d2cdc 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -37,6 +37,7 @@ #include "avcodec.h" #include "dca.h" +#include "dca_syncwords.h" #include "dcadata.h" #include "dcadsp.h" #include "dcahuff.h" @@ -1437,7 +1438,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data, uint32_t bits = get_bits_long(&s->gb, 32); switch (bits) { - case 0x5a5a5a5a: { + case DCA_SYNCWORD_XCH: { int ext_amode, xch_fsize; s->xch_base_channel = s->prim_channels; @@ -1479,7 +1480,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data, s->xch_present = 1; break; } - case 0x47004a03: + case DCA_SYNCWORD_XXCH: /* XXCh: extended channels */ /* usually found either in core or HD part in DTS-HD HRA streams, * but not in DTS-ES which contains XCh extensions instead */ @@ -1517,7 +1518,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data, /* check for ExSS (HD part) */ if (s->dca_buffer_size - s->frame_size > 32 && - get_bits_long(&s->gb, 32) == DCA_HD_MARKER) + get_bits_long(&s->gb, 32) == DCA_SYNCWORD_SUBSTREAM) ff_dca_exss_parse_header(s); avctx->profile = s->profile; |