Merge commit '4f22b138886e29f7fffa8c715673951e51be9f32'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 18:23:31 +0000 (18:23 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 18:23:31 +0000 (18:23 +0000)
commitea2df330525c8bca383e5ad9ecabbd9ec3d36c67
treea91d8318a1d82361c522c88e98cfaafbcb23a490
parent66eb8ce473e743e1f8b48756ce36310b83d380a2
parent4f22b138886e29f7fffa8c715673951e51be9f32
Merge commit '4f22b138886e29f7fffa8c715673951e51be9f32'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/x86/ac3dsp_init.c