diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-09-25 10:06:31 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-09-25 10:06:31 +0000 |
| commit | 792bb815e38224b8d7f1f1d3d2af1849a689ac87 (patch) | |
| tree | 12192a65e580e2b0b845b94f1b1fd9d0877eff4b | |
| parent | 5cbb0e70a0a2ee99eb3cb09e837b9a1f7355b9bc (diff) | |
| download | ffmpeg-792bb815e38224b8d7f1f1d3d2af1849a689ac87.tar.gz | |
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
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d90fefc7df..c8e87a1585 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2531,7 +2531,7 @@ static int fill_default_ref_list(H264Context *h){ for(out_i=0; out_i<h->short_ref_count; out_i++){ int best_i=-1; - int best_poc=-1; + int best_poc=INT_MAX; for(i=0; i<h->short_ref_count; i++){ 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); return -1; } + if(opcode == MMCO_END) + break; } h->mmco_index= i; }else{ |