• Michael Niedermayer's avatar
    Merge commit 'e57daa87' · 4789955e
    Michael Niedermayer authored
    * commit 'e57daa87':
      adpcm: decode directly to the user-provided AVFrame
      ac3: decode directly to the user-provided AVFrame
      aac: decode directly to the user-provided AVFrame
      8svx: decode directly to the user-provided AVFrame
    
    Conflicts:
    	libavcodec/8svx.c
    	libavcodec/ac3dec.c
    	libavcodec/adpcm.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4789955e
aac.h 10.7 KB