]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1'
authorJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 17:47:13 +0000 (14:47 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 17:47:13 +0000 (14:47 -0300)
* commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1':
  cook: Use the correct table for 6-bit stereo coupling

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/cookdata.h

Simple merge