[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec parser.c,1.25,1.26

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv30705

Modified Files:
	parser.c 
Log Message:
off by 1 error bugfix
avoid adding duplicate global headers to the bitstream


Index: parser.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/parser.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- parser.c	27 Jun 2005 00:04:03 -0000	1.25
+++ parser.c	29 Jun 2005 08:41:01 -0000	1.26
@@ -142,13 +142,17 @@
     return index;
 }
 
+/**
+ *
+ * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
+ */
 int av_parser_change(AVCodecParserContext *s,
                      AVCodecContext *avctx,
                      uint8_t **poutbuf, int *poutbuf_size, 
                      const uint8_t *buf, int buf_size, int keyframe){
    
     if(s && s->parser->split){
-        if((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) && !(avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)){
+        if((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) || (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)){
             int i= s->parser->split(avctx, buf, buf_size);
             buf += i;
             buf_size -= i;
@@ -166,7 +170,7 @@
             *poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
             
             memcpy(*poutbuf, avctx->extradata, avctx->extradata_size);
-            memcpy((*poutbuf) + avctx->extradata_size, buf, buf_size);
+            memcpy((*poutbuf) + avctx->extradata_size, buf, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
             return 1;
         }
     }
@@ -456,7 +460,7 @@
     for(i=0; i<buf_size; i++){
         state= (state<<8) | buf[i];
         if(state != 0x1B3 && state != 0x1B5 && state < 0x200 && state >= 0x100)
-            return i-4;
+            return i-3;
     }
     return 0;
 }
@@ -548,7 +552,7 @@
     for(i=0; i<buf_size; i++){
         state= (state<<8) | buf[i];
         if(state == 0x1B3 || state == 0x1B6)
-            return i-4;
+            return i-3;
     }
     return 0;
 }