Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Oct 2012 12:55:15 +0000 (14:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Oct 2012 13:20:48 +0000 (15:20 +0200)
commit9aa630a520eb985dc6eefa5bc0f96e8269265ecb
tree7b573b974d5f4622113e0798732aa4b67f49bae2
parent7fe6f6e2b10fe278fecea850fda1d8e321330c15
parent6aa93689abe8c095cec9fa828c2dee3131008995
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>
Makefile
common.mak
configure
libavformat/pcmdec.c
libavutil/Makefile