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

* qatar/master:
  configure: sanitise sparc vis check
  configure: recognise more sparc variants as --cpu argument
  build: Include HEADERS-yes in the HEADERS variable
  pcm: change references to raw to pcm
  ffv1: set the range coder state in decode_slice_header
  pcmdec: change default of channels parameter to 1

Conflicts:
	libavformat/pcmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-10-26 15:20:48 +02:00

5.5 KiB

Raw Blame History

View Raw