• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ae237a11
    Michael Niedermayer authored
    * qatar/master:
      swscale: try to use mmap only if available
      configure: check for mprotect
      wmapro: use planar sample format
      wmalossless: output in planar sample format
      wmadec: use float planar sample format output
      shorten: use planar sample format
      lavc: update documentation for AVFrame.extended_data
    
    Conflicts:
    	libavcodec/shorten.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ae237a11
wmadec.c 32.2 KB