Make most of E-AC-3 work without breaking regression tests.

[ffmpeg] / libavcodec / vc1_parser.c

diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c
index 4fa9e52a0b5ad8dae1aa984b6a89069771f20175..a76d147079f0ed04e23a38b3297f24a6e56ae6b1 100644 (file)
--- a/libavcodec/vc1_parser.c
+++ b/libavcodec/vc1_parser.c
@@ -26,7 +26,6 @@
  */
 
 #include "parser.h"
-#define VC1_PARSER_ONLY
 #include "vc1.h"
 
 /**
@@ -73,7 +72,7 @@ static int vc1_find_frame_end(ParseContext *pc, const uint8_t *buf,
 
 static int vc1_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)
 {
     ParseContext *pc = s->priv_data;
@@ -84,13 +83,13 @@ static int vc1_parse(AVCodecParserContext *s,
     }else{
         next= vc1_find_frame_end(pc, 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;
 }