Index: libavcodec/h264.c =================================================================== --- libavcodec/h264.c (revision 14820) +++ libavcodec/h264.c (working copy) @@ -3355,7 +3355,7 @@ * stream. Need to discard one frame. Prevents overrun of the * short_ref and long_ref buffers. */ - av_log(h->s.avctx, AV_LOG_ERROR, + av_log(h->s.avctx, AV_LOG_DEBUG, "number of reference frames exceeds max (probably " "corrupt input), discarding one\n"); @@ -7557,7 +7557,7 @@ if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0; - av_log(avctx, AV_LOG_ERROR, "no frame!\n"); + av_log(avctx, AV_LOG_DEBUG, "no frame!\n"); return -1; } Index: libavcodec/mpegvideo.c =================================================================== --- libavcodec/mpegvideo.c (revision 14820) +++ libavcodec/mpegvideo.c (working copy) @@ -779,19 +779,18 @@ } av_log(s->avctx, AV_LOG_FATAL, "Internal error, picture buffer overflow\n"); - /* We could return -1, but the codec would crash trying to draw into a - * non-existing frame anyway. This is safer than waiting for a random crash. - * Also the return of this is never useful, an encoder must only allocate - * as much as allowed in the specification. This has no relationship to how - * much libavcodec could allocate (and MAX_PICTURE_COUNT is always large - * enough for such valid streams). - * Plus, a decoder has to check stream validity and remove frames if too - * many reference frames are around. Waiting for "OOM" is not correct at - * all. Similarly, missing reference frames have to be replaced by - * interpolated/MC frames, anything else is a bug in the codec ... - */ - abort(); - return -1; + /* XXX there seems to be a leak caused by h264 in mpeg transport + * streams: Over-the-air streams have a lot of errors. A picture + * may be marked as referenced but the actual references get lost + * so it never gets released. We take care of that here by releasing + * the oldest we have & reusing its slot. */ + int oldest=0; + for(i=0; ipicture[i].coded_picture_number < s->picture[oldest].coded_picture_number) + oldest = i; + } + s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[oldest]); + return oldest; } static void update_noise_reduction(MpegEncContext *s){