RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hevc: clear unused refs on failure

This commit is contained in:
Anton Khirnov 2014-11-20 09:26:35 +01:00
parent f9f883af4f
commit 1dd021929f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/hevc_refs.c
View File

@ -390,7 +390,7 @@ int ff_hevc_frame_rps(HEVCContext *s)
const ShortTermRPS *short_rps = s->sh.short_term_rps; const ShortTermRPS *short_rps = s->sh.short_term_rps;
const LongTermRPS *long_rps = &s->sh.long_term_rps; const LongTermRPS *long_rps = &s->sh.long_term_rps;
RefPicList *rps = s->rps; RefPicList *rps = s->rps;
int i, ret; int i, ret = 0;
if (!short_rps) { if (!short_rps) {
rps[0].nb_refs = rps[1].nb_refs = 0; rps[0].nb_refs = rps[1].nb_refs = 0;
@ -424,7 +424,7 @@ int ff_hevc_frame_rps(HEVCContext *s)
ret = add_candidate_ref(s, &rps[list], poc, HEVC_FRAME_FLAG_SHORT_REF); ret = add_candidate_ref(s, &rps[list], poc, HEVC_FRAME_FLAG_SHORT_REF);
if (ret < 0) if (ret < 0)
return ret; goto fail;
} }
/* add the long refs */ /* add the long refs */
@ -434,14 +434,15 @@ int ff_hevc_frame_rps(HEVCContext *s)
ret = add_candidate_ref(s, &rps[list], poc, HEVC_FRAME_FLAG_LONG_REF); ret = add_candidate_ref(s, &rps[list], poc, HEVC_FRAME_FLAG_LONG_REF);
if (ret < 0) if (ret < 0)
return ret; goto fail;
} }
fail:
/* release any frames that are now unused */ /* release any frames that are now unused */
for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++)
ff_hevc_unref_frame(s, &s->DPB[i], 0); ff_hevc_unref_frame(s, &s->DPB[i], 0);
return 0; return ret;
} }
int ff_hevc_compute_poc(HEVCContext *s, int poc_lsb) int ff_hevc_compute_poc(HEVCContext *s, int poc_lsb)