Merge commit '1b90433f'
* commit '1b90433f': libfdk-aacdec: Always decode into an intermediate buffer Conflicts: libavcodec/libfdk-aacdec.c Merged-by: NHendrik Leppkes <h.leppkes@gmail.com>
Showing
想要评论请 注册 或 登录
* commit '1b90433f': libfdk-aacdec: Always decode into an intermediate buffer Conflicts: libavcodec/libfdk-aacdec.c Merged-by: NHendrik Leppkes <h.leppkes@gmail.com>