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)
commit42a29015e1bd5ae6d8c5d379ce4294193288220f
tree2b8405f448bc5330ec844f4c840bcce4c44ad6fc
parente34ad128a36355da22e2c7b01cbac8000e8146d6
parenta7a07cc98ac548297b5b0628cb81280e11952e3f
Merge commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f'

* commit 'a7a07cc98ac548297b5b0628cb81280e11952e3f':
  hevc: check that VPS referenced from SPS exists

Conflicts:
libavcodec/hevc_ps.c

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