]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit 'a3daecd6375279d9fdb863ac9db3545a33e97651':
  cbs: Demote the "decomposition unimplemented" warning

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

Simple merge