• Michael Niedermayer's avatar
    Merge commit '182821cf' · 0a513869
    Michael Niedermayer authored
    * commit '182821cf':
      dca: decode directly to the user-provided AVFrame
      cook: decode directly to the user-provided AVFrame
      comfortnoise: decode directly to the user-provided AVFrame
      bmvaudio: decode directly to the user-provided AVFrame
      pcm: decode directly to the user-provided AVFrame
    
    Conflicts:
    	libavcodec/pcm.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0a513869
bmv.c 11.4 KB