Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:42:51 +0000 (15:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 15:42:21 +0000 (16:42 +0100)
commit2368d08e701acf7942bf6d70a40a3e70186199ea
tree33dc8bc79cf603e85e02a949f2c2c0755d6b0aa2
parentea7ccf3748452b614b6ae81fa814303a49733fc2
Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'

* commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac':
  hevc: Bound check cu_qp_delta

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a69dd1163b1a91978e596af551c9561d121aeedf)

Conflicts:

libavcodec/hevc.c
libavcodec/hevc.c