# HG changeset patch # User michael # Date 1222369299 0 # Node ID 2c15748c530a3b77516fc83abeab9975247af7f5 # Parent ed0ebbb168b6673711402349b01913a1ab6657f9 Do not free sps & pps on width/height changes. Fixes issue557. diff -r ed0ebbb168b6 -r 2c15748c530a h264.c --- a/h264.c Thu Sep 25 14:34:14 2008 +0000 +++ b/h264.c Thu Sep 25 19:01:39 2008 +0000 @@ -2034,12 +2034,6 @@ av_freep(&h->mb2b_xy); av_freep(&h->mb2b8_xy); - for(i = 0; i < MAX_SPS_COUNT; i++) - av_freep(h->sps_buffers + i); - - for(i = 0; i < MAX_PPS_COUNT; i++) - av_freep(h->pps_buffers + i); - for(i = 0; i < h->s.avctx->thread_count; i++) { hx = h->thread_context[i]; if(!hx) continue; @@ -7920,10 +7914,18 @@ { H264Context *h = avctx->priv_data; MpegEncContext *s = &h->s; + int i; av_freep(&h->rbsp_buffer[0]); av_freep(&h->rbsp_buffer[1]); free_tables(h); //FIXME cleanup init stuff perhaps + + for(i = 0; i < MAX_SPS_COUNT; i++) + av_freep(h->sps_buffers + i); + + for(i = 0; i < MAX_PPS_COUNT; i++) + av_freep(h->pps_buffers + i); + MPV_common_end(s); // memset(h, 0, sizeof(H264Context));