Michael Niedermayer ae237a117a Merge remote-tracking branch 'qatar/master' ...

* 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: Michael Niedermayer <michaelni@gmx.at>

2012-10-15 14:09:35 +02:00

63 KiB

Raw Blame History

View Raw