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)
* commit '0d999333f96a34903448579bf13a3209deaee9da':
  hevc: Bound check slice_qp

Conflicts:
libavcodec/hevc.c

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

Simple merge