wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qatar/master'

Browse source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-10-26 14:55:15 +02:00
commit 9aa630a520
5 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libavutil/Makefile
View file

@ -2,8 +2,6 @@ include $(SUBDIR)../config.mak
NAME = avutil
HEADERS-$(CONFIG_LZO) += lzo.h
HEADERS = adler32.h \
aes.h \
attributes.h \
@ -47,7 +45,8 @@ HEADERS = adler32.h \
timestamp.h \
version.h \
xtea.h \
$(HEADERS-yes) \
HEADERS-$(CONFIG_LZO) += lzo.h
ARCH_HEADERS = bswap.h \
intmath.h \