virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

off by 1 error bugfix

Browse Source 
avoid adding duplicate global headers to the bitstream

Originally committed as revision 4410 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-06-29 08:41:01 +00:00
parent c35afa2f57
commit 73480a1552
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/parser.c
View File

@ -142,13 +142,17 @@ int av_parser_parse(AVCodecParserContext *s,
return index; 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, int av_parser_change(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size, uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size, int keyframe){ const uint8_t *buf, int buf_size, int keyframe){
if(s && s->parser->split){ 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); int i= s->parser->split(avctx, buf, buf_size);
buf += i; buf += i;
buf_size -= i; buf_size -= i;
@ -166,7 +170,7 @@ int av_parser_change(AVCodecParserContext *s,
*poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); *poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
memcpy(*poutbuf, avctx->extradata, avctx->extradata_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; return 1;
} }
} }
@ -456,7 +460,7 @@ static int mpegvideo_split(AVCodecContext *avctx,
for(i=0; i<buf_size; i++){ for(i=0; i<buf_size; i++){
state= (state<<8) | buf[i]; state= (state<<8) | buf[i];
if(state != 0x1B3 && state != 0x1B5 && state < 0x200 && state >= 0x100) if(state != 0x1B3 && state != 0x1B5 && state < 0x200 && state >= 0x100)
return i-4; return i-3;
} }
return 0; return 0;
} }
@ -548,7 +552,7 @@ static int mpeg4video_split(AVCodecContext *avctx,
for(i=0; i<buf_size; i++){ for(i=0; i<buf_size; i++){
state= (state<<8) | buf[i]; state= (state<<8) | buf[i];
if(state == 0x1B3 || state == 0x1B6) if(state == 0x1B3 || state == 0x1B6)
return i-4; return i-3;
} }
return 0; return 0;
} }