• Michael Niedermayer's avatar
    Merge commit 'cb7b47a6' · d88e674a
    Michael Niedermayer authored
    * commit 'cb7b47a6':
      g726: decode directly to the user-provided AVFrame
      g723.1: decode directly to the user-provided AVFrame
      g722: decode directly to the user-provided AVFrame
      flac: decode directly to the user-provided AVFrame
      cinaudio: decode directly to the user-provided AVFrame
    
    Conflicts:
    	libavcodec/g723_1.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d88e674a
g722dec.c 5.08 KB