Commit 16830d96 authored by michael's avatar michael

correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)

fixes decoding of MR2_MW_A.264


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3916 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6b4dcd90
...@@ -3150,10 +3150,12 @@ static void idr(H264Context *h){ ...@@ -3150,10 +3150,12 @@ static void idr(H264Context *h){
break; \ break; \
} }
for(i=0; i<h->long_ref_count; i++){ for(i=0; i<16; i++){
h->long_ref[i]->reference=0; if (h->long_ref[i] != NULL) {
CHECK_DELAY(h->long_ref[i]); h->long_ref[i]->reference=0;
h->long_ref[i]= NULL; CHECK_DELAY(h->long_ref[i]);
h->long_ref[i]= NULL;
}
} }
h->long_ref_count=0; h->long_ref_count=0;
...@@ -3263,6 +3265,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ ...@@ -3263,6 +3265,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num);
h->long_ref[ mmco[i].long_index ]->long_ref=1; h->long_ref[ mmco[i].long_index ]->long_ref=1;
h->long_ref_count++;
break; break;
case MMCO_LONG2UNUSED: case MMCO_LONG2UNUSED:
pic= remove_long(h, mmco[i].long_index); pic= remove_long(h, mmco[i].long_index);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment