• Michael Niedermayer's avatar
    Merge commit '5cc0bd2c' · f03cdbd0
    Michael Niedermayer authored
    * commit '5cc0bd2c':
      binkaudio: decode directly to the user-provided AVFrame
      atrac3: decode directly to the user-provided AVFrame
      atrac1: decode directly to the user-provided AVFrame
      ape: decode directly to the user-provided AVFrame
      amrwb: decode directly to the user-provided AVFrame
    
    Conflicts:
    	libavcodec/amrwbdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f03cdbd0
atrac3.c 32.4 KB