generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)

Browse Source 
Originally committed as revision 4189 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-05-06 17:04:03 +00:00
parent 415264045f
commit b712fb6740
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264.c
View File

@ -3697,6 +3697,11 @@ static int init_poc(H264Context *h){
if(h->sps.poc_type==0){ if(h->sps.poc_type==0){
const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
if(h->nal_unit_type == NAL_IDR_SLICE){
h->prev_poc_msb=
h->prev_poc_lsb= 0;
}
if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2)
h->poc_msb = h->prev_poc_msb + max_poc_lsb; h->poc_msb = h->prev_poc_msb + max_poc_lsb;
else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2)
@ -6946,7 +6951,7 @@ static int decode_frame(AVCodecContext *avctx,
cur->reference = 1; cur->reference = 1;
for(i=0; h->delayed_pic[i]; i++) for(i=0; h->delayed_pic[i]; i++)
if(h->delayed_pic[i]->key_frame) if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0)
cross_idr = 1; cross_idr = 1;
out = h->delayed_pic[0]; out = h->delayed_pic[0];