Merge commit '869fc416f7c78ed4e397e0208acd1545771c0502'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 21:32:48 +0000 (23:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 21:32:55 +0000 (23:32 +0200)
commit8e2ade43f1d0d093f0a4280db7521ba952cc0b96
treeb627adfa18d6a8a270e16805a1f81642d1def204
parentdacc4cb11513543bdeeffef7944181418b70ce64
parent869fc416f7c78ed4e397e0208acd1545771c0502
Merge commit '869fc416f7c78ed4e397e0208acd1545771c0502'

* commit '869fc416f7c78ed4e397e0208acd1545771c0502':
  hevc: Mark num_bins_in_se as unused

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