assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washi...

Originally committed as revision 3505 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d90fefc..c8e87a1 100644 (file)
--- 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{