diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:05:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:08:45 +0100 |
| commit | 12a4042445231a5032c9507f31d65a63d08aed1b (patch) | |
| tree | 180f2e80f78ffa176fe56af03687fff40605d7fe /libavcodec | |
| parent | 1dbb3cfa17c131361aa7320a1a92c2bdef018460 (diff) | |
| parent | 33452aede6acab78f726cd1924824585f00765cc (diff) | |
| download | ffmpeg-12a4042445231a5032c9507f31d65a63d08aed1b.tar.gz | |
Merge commit '33452aede6acab78f726cd1924824585f00765cc'
* 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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hevc_ps.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 63b5ddd25c..80e7311b99 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -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: |