• Michael Niedermayer's avatar
    Merge commit '1b9b6d6e' · 65da7007
    Michael Niedermayer authored
    * commit '1b9b6d6e':
      qcelp: decode directly to the user-provided AVFrame
      pcm-bluray: decode directly to the user-provided AVFrame
      nellymoser: decode directly to the user-provided AVFrame
      mpc7/8: decode directly to the user-provided AVFrame
      mpegaudio: decode directly to the user-provided AVFrame
      mlp/truehd: decode directly to the user-provided AVFrame
    
    Conflicts:
    	libavcodec/mpc7.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    65da7007
mpc7.c 11.5 KB