Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:42:51 +0000 (15:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:42:51 +0000 (15:42 +0100)
commita69dd1163b1a91978e596af551c9561d121aeedf
treecd4ab5055e1437fd08713556b7b64c53291fb1a0
parent58f437c3f6672f2a42d7e4bee79ad91e9fe4bdcc
parente22ebd04bcab7f86548794556c28ecca46d9c2ac
Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'

* commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac':
  hevc: Bound check cu_qp_delta

Conflicts:
libavcodec/hevc.c

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