videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-11 03:45:05 +02:00
Code Releases Activity

Fix crash on resolution change (issue 2393).

Browse Source 
Don't free RBSP tables (containing decoded NAL units) on resolution
change, because we actually need this data to decode the frame after
reiniting (with new resolution). Fixed issue 2393.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 9107892624)
This commit is contained in:
Ronald S. Bultje 2011-01-22 14:42:56 +00:00 committed by Michael Niedermayer
parent 60c99b5510
commit 2ed0f76655
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h264.c
View File

@ -614,7 +614,7 @@ static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t
}
static void free_tables(H264Context *h){
static void free_tables(H264Context *h, int free_rbsp){
int i;
H264Context *hx;
av_freep(&h->intra4x4_pred_mode);
@ -637,10 +637,12 @@ static void free_tables(H264Context *h){
av_freep(&hx->top_borders[1]);
av_freep(&hx->top_borders[0]);
av_freep(&hx->s.obmc_scratchpad);
if (free_rbsp){
av_freep(&hx->rbsp_buffer[1]);
av_freep(&hx->rbsp_buffer[0]);
hx->rbsp_buffer_size[0] = 0;
hx->rbsp_buffer_size[1] = 0;
}
if (i) av_freep(&h->thread_context[i]);
}
}
@ -748,7 +750,7 @@ int ff_h264_alloc_tables(H264Context *h){
return 0;
fail:
free_tables(h);
free_tables(h, 1);
return -1;
}
@ -1776,7 +1778,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
|| av_cmp_q(h->sps.sar, s->avctx->sample_aspect_ratio))) {
if(h != h0)
return -1; // width / height changed during parallelized decoding
free_tables(h);
free_tables(h, 0);
flush_dpb(s->avctx);
MPV_common_end(s);
}
@ -3331,7 +3333,7 @@ av_cold void ff_h264_free_context(H264Context *h)
{
int i;
free_tables(h); //FIXME cleanup init stuff perhaps
free_tables(h, 1); //FIXME cleanup init stuff perhaps
for(i = 0; i < MAX_SPS_COUNT; i++)
av_freep(h->sps_buffers + i);