Merge commit '33452aede6acab78f726cd1924824585f00765cc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:05:04 +0000 (23:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:08:45 +0000 (23:08 +0100)
* 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>
libavcodec/hevc_ps.c

index 63b5ddd..80e7311 100644 (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: