Merge commit 'a3daecd6375279d9fdb863ac9db3545a33e97651'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 21:54:42 +0000 (21:54 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 21:54:42 +0000 (21:54 +0000)
commit1325ac4c93f27dd56ebce37d8045d7ceb64dc645
tree92b4ac783cc7d85e718f10403b2d6dc7bffd6173
parentf082dcab7cdf94b6268917a6dc472d594d7538f0
parenta3daecd6375279d9fdb863ac9db3545a33e97651
Merge commit 'a3daecd6375279d9fdb863ac9db3545a33e97651'

* commit 'a3daecd6375279d9fdb863ac9db3545a33e97651':
  cbs: Demote the "decomposition unimplemented" warning

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/cbs.c