Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:33:48 +0000 (16:33 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:33:48 +0000 (16:33 -0300)
commitfc2a94219df7eccd540e0dac42c27cd9e35148de
treec5220b54cbed688ab604e8e4ace235f2340f4170
parenta4ee9551138c8ba7b93c098cacc867d2e9ee95d1
parentd316f9cefcd854071985c6f524a9a15348240264
Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'

* commit 'd316f9cefcd854071985c6f524a9a15348240264':
  aac: Drop pointless cast

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/aacpsy.c