• Michael Niedermayer's avatar
    Merge commit '86bfcfcf' · afe30fe0
    Michael Niedermayer authored
    * commit '86bfcfcf':
      mace: decode directly to the user-provided AVFrame
      libspeex: decode directly to the user-provided AVFrame
      libopus: decode directly to the user-provided AVFrame
      libopencore-amr: decode directly to the user-provided AVFrame
      libgsm: decode directly to the user-provided AVFrame
    
    Conflicts:
    	libavcodec/libopusdec.c
    	libavcodec/mace.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    afe30fe0
mace.c 13.2 KB