Merge commit 'a10c4ce2'
* commit 'a10c4ce2': aac: Forward errors properly in aac_decode_frame_int Conflicts: libavcodec/aacdec.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit 'a10c4ce2': aac: Forward errors properly in aac_decode_frame_int Conflicts: libavcodec/aacdec.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>