• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9aa630a5
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9aa630a5
pcmdec.c 5.47 KB