# HG changeset patch # User heydowns # Date 1197610643 0 # Node ID 5455f4e43948069b6534a677a13b7d6c27527185 # Parent bb4f24c580f59eaf38eb95656a7b024eb336f15e Make h264 decoder conform to requirements of mpegvideo's MPV_frame_start. Namely, that it should not be called if you are starting to decode a B frame without any reference pictures. Prevents an endless allocation cycle in MPV_frame_start that will end in picture buffer overflow and abort. Fixes roundup issue 216. diff -r bb4f24c580f5 -r 5455f4e43948 h264.c --- a/h264.c Thu Dec 13 19:00:53 2007 +0000 +++ b/h264.c Fri Dec 14 05:37:23 2007 +0000 @@ -3911,6 +3911,11 @@ h->slice_type= slice_type; s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though + if (s->pict_type == B_TYPE && s->last_picture_ptr == NULL) { + av_log(h->s.avctx, AV_LOG_ERROR, + "B picture before any references, skipping\n"); + return -1; + } pps_id= get_ue_golomb(&s->gb); if(pps_id>=MAX_PPS_COUNT){