Merge commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:33:27 +0000 (11:33 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:33:27 +0000 (11:33 +0100)
commit5f044d23726375f451463ae443bb9a33827374be
tree05e245519ad79c3a495cdb098651e83c737d06b2
parent7b3a3e6276c42e6974cba2e9f36d140b8d760b0b
parentc19830aa2c19f9713b612f7e2fdb437df91ba266
Merge commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266'

* commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266':
  rscc: Support palette format

See 11777eb8142117864bff0c8060f17b4089434143

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