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)
commit0c126431f9b290f5651ec62f45627632d94c51ea
tree243b9c65e0c806550c2160a5f49dc9bf9f01f09d
parent6fc762b4fd2c28ef7a0689a1df5ce200e5f5948f
parent90adbf4abf336f8042aecdf1e18fdf76a96304b1
Merge commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1'

* commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1':
  cook: Use the correct table for 6-bit stereo coupling

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