[FFmpeg-cvslog] Merge commit 'f4bf236338f6001736a4784b9c23de863057a583'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 14:49:13 2017 -0300| [13a211e6320d061d9e8c29354c81239324b2db03] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13a211e6320d061d9e8c29354c81239324b2db03
---