Merge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Apr 2015 20:16:10 +0000 (22:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Apr 2015 20:16:10 +0000 (22:16 +0200)
commit235863463abcfda0e428bf1a79009316b2dd7895
treed80957807fc0675407ceca1a509c6077bed2512c
parent41dde62d7f4121495150fe0e0db26fc25c737901
parentdf528b11ac607de13a7c438f2a51f2119f71a03c
Merge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'

* commit 'df528b11ac607de13a7c438f2a51f2119f71a03c':
  hevc: make sure no dangling pointers remain around on VPS/SPS change

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc_ps.c