Remove -fasm CFLAGS check, it is no longer needed.

[ffmpeg] / libavcodec / dca_parser.c

diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
index 90eac203ebbe0665dbf58da44f9febe7ce65b4cd..f182506f8a548d6d9b8983e602a4407dcfde4d48 100644 (file)
--- a/libavcodec/dca_parser.c
+++ b/libavcodec/dca_parser.c
@@ -32,6 +32,8 @@
 typedef struct DCAParseContext {
     ParseContext pc;
     uint32_t lastmarker;
+    int size;
+    int framesize;
 } DCAParseContext;
 
 #define IS_MARKER(state, i, buf, buf_size) \
@@ -71,10 +73,13 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
     }
     if (start_found) {
         for (; i < buf_size; i++) {
+            pc1->size++;
             state = (state << 8) | buf[i];
-            if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) {
+            if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size) && (!pc1->framesize || pc1->framesize == pc1->size)) {
                 pc->frame_start_found = 0;
                 pc->state = -1;
+                pc1->framesize = pc1->size;
+                pc1->size = 0;
                 return i - 3;
             }
         }
@@ -84,7 +89,7 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
     return END_NOT_FOUND;
 }
 
-static int dca_parse_init(AVCodecParserContext * s)
+static av_cold int dca_parse_init(AVCodecParserContext * s)
 {
     DCAParseContext *pc1 = s->priv_data;
 
@@ -94,7 +99,7 @@ static int dca_parse_init(AVCodecParserContext * s)
 
 static int dca_parse(AVCodecParserContext * s,
                      AVCodecContext * avctx,
-                     uint8_t ** poutbuf, int *poutbuf_size,
+                     const uint8_t ** poutbuf, int *poutbuf_size,
                      const uint8_t * buf, int buf_size)
 {
     DCAParseContext *pc1 = s->priv_data;
@@ -106,13 +111,13 @@ static int dca_parse(AVCodecParserContext * s,
     } else {
         next = dca_find_frame_end(pc1, buf, buf_size);
 
-        if (ff_combine_frame(pc, next, (uint8_t **) & buf, &buf_size) < 0) {
+        if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
             *poutbuf = NULL;
             *poutbuf_size = 0;
             return buf_size;
         }
     }
-    *poutbuf = (uint8_t *) buf;
+    *poutbuf = buf;
     *poutbuf_size = buf_size;
     return next;
 }