[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h264.c,1.160,1.161

[Loren Merritt CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv20788

Modified Files:
	h264.c 
Log Message:
fix a crash on dropped frames



Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- h264.c	26 Oct 2005 03:58:06 -0000	1.160
+++ h264.c	27 Oct 2005 21:03:36 -0000	1.161
@@ -7672,7 +7672,7 @@
         out_of_order = !cross_idr && prev && out->poc < prev->poc;
         if(prev && pics <= s->avctx->has_b_frames)
             out = prev;
-        else if((out_of_order && pics-1 == s->avctx->has_b_frames)
+        else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
            || (s->low_delay && 
             ((!cross_idr && prev && out->poc > prev->poc + 2)
              || cur->pict_type == B_TYPE)))