har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '33452aede6acab78f726cd1924824585f00765cc'

Browse Source 
* commit '33452aede6acab78f726cd1924824585f00765cc':
  hevc: store the VPS list as an AVBufferRef, just like the others *PS

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_ps.c

See: 36658c978f5d7df2ce556075946f3a80f7eca753
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-11 23:05:04 +01:00
commit 12a4042445
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/hevc_ps.c
View File

@ -336,9 +336,6 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "Decoding VPS\n");
if (!vps)
return AVERROR(ENOMEM);
vps_id = get_bits(gb, 4);
if (vps_id >= MAX_VPS_COUNT) {
av_log(s->avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", vps_id);
@ -416,7 +413,6 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
av_buffer_unref(&s->vps_list[vps_id]);
s->vps_list[vps_id] = vps_buf;
return 0;
err: