mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3505 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5cbb0e70a0
commit
792bb815e3
@ -2531,7 +2531,7 @@ static int fill_default_ref_list(H264Context *h){
|
|||||||
|
|
||||||
for(out_i=0; out_i<h->short_ref_count; out_i++){
|
for(out_i=0; out_i<h->short_ref_count; out_i++){
|
||||||
int best_i=-1;
|
int best_i=-1;
|
||||||
int best_poc=-1;
|
int best_poc=INT_MAX;
|
||||||
|
|
||||||
for(i=0; i<h->short_ref_count; i++){
|
for(i=0; i<h->short_ref_count; i++){
|
||||||
const int poc= h->short_ref[i]->poc;
|
const int poc= h->short_ref[i]->poc;
|
||||||
@ -2899,6 +2899,8 @@ static int decode_ref_pic_marking(H264Context *h){
|
|||||||
av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode);
|
av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
if(opcode == MMCO_END)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
h->mmco_index= i;
|
h->mmco_index= i;
|
||||||
}else{
|
}else{
|
||||||
|
Loading…
Reference in New Issue
Block a user