eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also check the location of the picture start code and picture coding

Browse Source 
extension a little.

Originally committed as revision 20644 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2009-11-28 23:05:06 +00:00
parent fc23d843e1
commit 88eba670fb
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpeg12.c
View File

@@ -2306,6 +2306,7 @@ static int decode_chunks(AVCodecContext *avctx,
break; break;
case PICTURE_START_CODE: case PICTURE_START_CODE:
if(last_code == 0 || last_code == SLICE_MIN_START_CODE){
if(mpeg_decode_postinit(avctx) < 0){ if(mpeg_decode_postinit(avctx) < 0){
av_log(avctx, AV_LOG_ERROR, "mpeg_decode_postinit() failure\n"); av_log(avctx, AV_LOG_ERROR, "mpeg_decode_postinit() failure\n");
return -1; return -1;
@@ -2316,6 +2317,9 @@ static int decode_chunks(AVCodecContext *avctx,
buf_ptr, input_size) < 0) buf_ptr, input_size) < 0)
s2->pict_type=0; s2->pict_type=0;
last_code= PICTURE_START_CODE; last_code= PICTURE_START_CODE;
}else{
av_log(avctx, AV_LOG_ERROR, "ignoring pic after %X\n", last_code);
}
break; break;
case EXT_START_CODE: case EXT_START_CODE:
init_get_bits(&s2->gb, buf_ptr, input_size*8); init_get_bits(&s2->gb, buf_ptr, input_size*8);
@@ -2338,8 +2342,11 @@ static int decode_chunks(AVCodecContext *avctx,
mpeg_decode_picture_display_extension(s); mpeg_decode_picture_display_extension(s);
break; break;
case 0x8: case 0x8:
if(last_code == PICTURE_START_CODE){
mpeg_decode_picture_coding_extension(s); mpeg_decode_picture_coding_extension(s);
last_code= PICTURE_START_CODE; }else{
av_log(avctx, AV_LOG_ERROR, "ignoring pic cod ext after %X\n", last_code);
}
break; break;
} }
break; break;