apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-19 15:15:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

hevc: store the VPS list as an AVBufferRef, just like the others *PS

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Gildas Cocherel
2013-12-10 15:42:28 +01:00
committed by Anton Khirnov
parent b769cf4b44
commit 33452aede6
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/hevc_ps.c
View File

@@ -328,13 +328,14 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
GetBitContext *gb = &s->HEVClc.gb;
int vps_id = 0;
HEVCVPS *vps;
AVBufferRef *vps_buf = av_buffer_allocz(sizeof(*vps));
if (!vps_buf)
return AVERROR(ENOMEM);
vps = (HEVCVPS*)vps_buf->data;
av_log(s->avctx, AV_LOG_DEBUG, "Decoding VPS\n");
vps = av_mallocz(sizeof(*vps));
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);
@@ -410,12 +411,12 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
}
get_bits1(gb); /* vps_extension_flag */
av_free(s->vps_list[vps_id]);
s->vps_list[vps_id] = vps;
av_buffer_unref(&s->vps_list[vps_id]);
s->vps_list[vps_id] = vps_buf;
return 0;
err:
av_free(vps);
av_buffer_unref(&vps_buf);
return AVERROR_INVALIDDATA;
}