DCA frame size is constant

Originally committed as revision 12835 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
index be9af1fd63a0a3b8217d80a973d443d824a08a32..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;
             }
         }