Merge commit '0d999333f96a34903448579bf13a3209deaee9da'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:38:29 +0000 (15:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:38:29 +0000 (15:38 +0100)
commit58f437c3f6672f2a42d7e4bee79ad91e9fe4bdcc
treecece09697dfcdc667b683341064b37e240d64ffe
parent5b93b2722dea3e73612fe3001113387f842ed9f8
parent0d999333f96a34903448579bf13a3209deaee9da
Merge commit '0d999333f96a34903448579bf13a3209deaee9da'

* commit '0d999333f96a34903448579bf13a3209deaee9da':
  hevc: Bound check slice_qp

Conflicts:
libavcodec/hevc.c

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