Merge commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:03:10 +0000 (15:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:04:24 +0000 (15:04 +0100)
* commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f':
  hevc: check that VPS referenced from SPS exists

Conflicts:
libavcodec/hevc_ps.c

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

Simple merge