diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 15:03:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 15:04:24 +0100 |
| commit | 42a29015e1bd5ae6d8c5d379ce4294193288220f (patch) | |
| tree | 2b8405f448bc5330ec844f4c840bcce4c44ad6fc /libavcodec/hevc_ps.c | |
| parent | e34ad128a36355da22e2c7b01cbac8000e8146d6 (diff) | |
| parent | a7a07cc98ac548297b5b0628cb81280e11952e3f (diff) | |
| download | ffmpeg-42a29015e1bd5ae6d8c5d379ce4294193288220f.tar.gz | |
Merge commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f'
* commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f':
hevc: check that VPS referenced from SPS exists
Conflicts:
libavcodec/hevc_ps.c
See: d66bab0a69ac1860e78dd951ad8db1a507e75642
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_ps.c')
| -rw-r--r-- | libavcodec/hevc_ps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 24968cce03..b7a01bbe20 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -636,7 +636,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) } if (!s->vps_list[sps->vps_id]) { - av_log(s->avctx, AV_LOG_ERROR, "VPS does not exist \n"); + av_log(s->avctx, AV_LOG_ERROR, "VPS %d does not exist\n", + sps->vps_id); ret = AVERROR_INVALIDDATA; goto err; } |