Synchronize AAC encoder with renamings in aac.h

[ffmpeg] / libavcodec / h261_parser.c

diff --git a/libavcodec/h261_parser.c b/libavcodec/h261_parser.c
index 8c32b8bb0d0332cad77759df337ddeb8343eaa4b..3f3aac6e471e731fbcb409f554235304c4ce28e9 100644 (file)
--- a/libavcodec/h261_parser.c
+++ b/libavcodec/h261_parser.c
@@ -38,7 +38,7 @@ static int h261_find_frame_end(ParseContext *pc, AVCodecContext* avctx, const ui
     for(i=0; i<buf_size && !vop_found; i++){
         state= (state<<8) | buf[i];
         for(j=0; j<8; j++){
-            if(((state>>j)&0xFFFFF) == 0x00010){
+            if(((state>>j)&0xFFFFF0) == 0x000100){
                 vop_found=1;
                 break;
             }
@@ -48,10 +48,10 @@ static int h261_find_frame_end(ParseContext *pc, AVCodecContext* avctx, const ui
         for(; i<buf_size; i++){
             state= (state<<8) | buf[i];
             for(j=0; j<8; j++){
-                if(((state>>j)&0xFFFFF) == 0x00010){
+                if(((state>>j)&0xFFFFF0) == 0x000100){
                     pc->frame_start_found=0;
-                    pc->state= state>>(2*8);
-                    return i-1;
+                    pc->state= (state>>(3*8))+0xFF00;
+                    return i-2;
                 }
             }
         }
@@ -64,19 +64,19 @@ static int h261_find_frame_end(ParseContext *pc, AVCodecContext* avctx, const ui
 
 static int h261_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;
     int next;
 
     next= h261_find_frame_end(pc,avctx, 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;
 }