Merge commit 'f4bf236338f6001736a4784b9c23de863057a583'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 17:49:13 +0000 (14:49 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 18:14:24 +0000 (15:14 -0300)
commit13a211e6320d061d9e8c29354c81239324b2db03
tree75612937cd40b35f5943f8d1055266fca479bbf5
parente2f6e1c4a825cdd95dafc349dcfd4bc05da88fd3
parentf4bf236338f6001736a4784b9c23de863057a583
Merge commit 'f4bf236338f6001736a4784b9c23de863057a583'

* commit 'f4bf236338f6001736a4784b9c23de863057a583':
  matroskaenc: fix muxing AAC streams when using aac_adtstoasc bsf

This commit is a noop. aac_adtstoasc bsf sends its extradata update
straight to codecpar->extradata.
This behavior violates the bsf API and should be fixed so this change
may then be applied.

Merged-by: James Almer <jamrial@gmail.com>