diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 21:37:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 21:37:03 +0200 |
| commit | 41dde62d7f4121495150fe0e0db26fc25c737901 (patch) | |
| tree | d4d3ec545abb4268eab0a5ed2aec661b6d62330c /libavcodec/hevc_ps.c | |
| parent | d386a523aefe2fed880b5e7d20929e1f65a6e138 (diff) | |
| parent | ce0bc09ee2580d49fec90a6eb0de2ba1b580c854 (diff) | |
Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'
* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
hevc: do not change the VPS if its contents are the same
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_ps.c')
| -rw-r--r-- | libavcodec/hevc_ps.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 075a4bd915..f6e7ab93fd 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -458,8 +458,14 @@ int ff_hevc_decode_nal_vps(HEVCContext *s) goto err; } - av_buffer_unref(&s->vps_list[vps_id]); - s->vps_list[vps_id] = vps_buf; + if (s->vps_list[vps_id] && + !memcmp(s->vps_list[vps_id]->data, vps_buf->data, vps_buf->size)) { + av_buffer_unref(&vps_buf); + } else { + av_buffer_unref(&s->vps_list[vps_id]); + s->vps_list[vps_id] = vps_buf; + } + return 0; err: |