Merge commit '5c89022542ce8521d89ef58858342a7bc1c3cd0d'
authorClément Bœsch <u@pkh.me>
Sat, 8 Apr 2017 12:18:03 +0000 (14:18 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 8 Apr 2017 12:18:03 +0000 (14:18 +0200)
commit6e836052d8c86818a8173c4c802504f0f3c5408e
treec8f721788a38879f11845c26586a4aa7adfdc375
parent2d40fbe639855e1c6d086699dfd76f15ce96aa42
parent5c89022542ce8521d89ef58858342a7bc1c3cd0d
Merge commit '5c89022542ce8521d89ef58858342a7bc1c3cd0d'

* commit '5c89022542ce8521d89ef58858342a7bc1c3cd0d':
  hevc: Drop pointless av_unused attribute

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/hevc_cabac.c