diff options
Diffstat (limited to 'libavcodec/dca_parser.c')
| -rw-r--r-- | libavcodec/dca_parser.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c index f182506f8a..b1c06e4880 100644 --- a/libavcodec/dca_parser.c +++ b/libavcodec/dca_parser.c @@ -34,6 +34,7 @@ typedef struct DCAParseContext { uint32_t lastmarker; int size; int framesize; + int hd_pos; } DCAParseContext; #define IS_MARKER(state, i, buf, buf_size) \ @@ -75,10 +76,16 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf, for (; i < buf_size; i++) { pc1->size++; state = (state << 8) | buf[i]; - if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size) && (!pc1->framesize || pc1->framesize == pc1->size)) { + if (state == DCA_HD_MARKER && !pc1->hd_pos) + pc1->hd_pos = pc1->size; + if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) { + if(pc1->framesize > pc1->size) + continue; + if(!pc1->framesize){ + pc1->framesize = pc1->hd_pos ? pc1->hd_pos : pc1->size; + } pc->frame_start_found = 0; pc->state = -1; - pc1->framesize = pc1->size; pc1->size = 0; return i - 3; } |