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

bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)

Browse Source 
Originally committed as revision 4747 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-12-17 11:31:56 +00:00
parent 725e38777f
commit 63d33cf439
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h263.c
View File

@ -5744,10 +5744,10 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){
char buf[256]; char buf[256];
int i; int i;
int e; int e;
int ver, build, ver2, ver3; int ver = 0, build = 0, ver2 = 0, ver3 = 0;
char last; char last;
for(i=0; i<255; i++){ for(i=0; i<255 && gb->index < gb->size_in_bits; i++){
if(show_bits(gb, 23) == 0) break; if(show_bits(gb, 23) == 0) break;
buf[i]= get_bits(gb, 8); buf[i]= get_bits(gb, 8);
} }
@ -5769,7 +5769,8 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){
e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build); e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build);
if(e!=4){ if(e!=4){
e=sscanf(buf, "Lavc%d.%d.%d", &ver, &ver2, &ver3)+1; e=sscanf(buf, "Lavc%d.%d.%d", &ver, &ver2, &ver3)+1;
build= (ver<<16) + (ver2<<8) + ver3; if (e>1)
build= (ver<<16) + (ver2<<8) + ver3;
} }
if(e!=4){ if(e!=4){
if(strcmp(buf, "ffmpeg")==0){ if(strcmp(buf, "ffmpeg")==0){
@ -6013,9 +6014,6 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb)
startcode = 0xff; startcode = 0xff;
for(;;) { for(;;) {
v = get_bits(gb, 8);
startcode = ((startcode << 8) | v) & 0xffffffff;
if(get_bits_count(gb) >= gb->size_in_bits){ if(get_bits_count(gb) >= gb->size_in_bits){
if(gb->size_in_bits==8 && (s->divx_version || s->xvid_build)){ if(gb->size_in_bits==8 && (s->divx_version || s->xvid_build)){
av_log(s->avctx, AV_LOG_ERROR, "frame skip %d\n", gb->size_in_bits); av_log(s->avctx, AV_LOG_ERROR, "frame skip %d\n", gb->size_in_bits);
@ -6024,6 +6022,10 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb)
return -1; //end of stream return -1; //end of stream
} }
/* use the bits after the test */
v = get_bits(gb, 8);
startcode = ((startcode << 8) | v) & 0xffffffff;
if((startcode&0xFFFFFF00) != 0x100) if((startcode&0xFFFFFF00) != 0x100)
continue; //no startcode continue; //no startcode

2
libavcodec/svq3.c
View File

@ -829,7 +829,7 @@ static int svq3_decode_frame (AVCodecContext *avctx,
GetBitContext gb; GetBitContext gb;
size = BE_32(&extradata[4]); size = BE_32(&extradata[4]);
init_get_bits (&gb, extradata + 8, size); init_get_bits (&gb, extradata + 8, size*8);
/* 'frame size code' and optional 'width, height' */ /* 'frame size code' and optional 'width, height' */
if (get_bits (&gb, 3) == 7) { if (get_bits (&gb, 3) == 7) {