Merge commit 'dd3aa85b68c017c419acb0c39ff6aa890ce89e87'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:18:20 +0000 (17:18 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:19:52 +0000 (17:19 -0300)
commit9484b9f4ba66a96b9b565f33f1eeb6e9b9b79e96
treedf2830eac159d04478aebf7a8e64de8a4d9990e5
parentf3ccc5e22acdd5f4eff7f875981a2209b6f2aa66
parentdd3aa85b68c017c419acb0c39ff6aa890ce89e87
Merge commit 'dd3aa85b68c017c419acb0c39ff6aa890ce89e87'

* commit 'dd3aa85b68c017c419acb0c39ff6aa890ce89e87':
  aac_ac3_parser: Drop in-parser downmix functionality

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