diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-15 23:35:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-15 23:35:53 +0200 |
| commit | 1a34478b7183b1a08caab7eac56b452609725736 (patch) | |
| tree | 4ddae5c3407716d83b592694cdabbdb3dff3041f /common.mak | |
| parent | 6ae356c9a0987d56f60137f9784afcb3a9303037 (diff) | |
| parent | cc73511e8e81b2e1454f406acb71da9fd1c60d32 (diff) | |
| download | ffmpeg-1a34478b7183b1a08caab7eac56b452609725736.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix NASM include directive
dsputil_mmx: Honor HAVE_AMD3DNOW
lavf,lavd: remove all usage of AVFormatParameters from demuxers.
jack: add 'channels' private option.
VC-1: fix reading of custom PAR.
Remove redundant and dubious video codec detection by its extradata
mpeg12: remove repeat-field code disabled since May 2002
patch checklist: suggest fate instead of regression tests
Turn on resampling on sudden size change instead of bailing out during recode.
avtools: reinitialise filter chain when input video stream changes dimensions
Conflicts:
Makefile
avconv.c
doc/developer.texi
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavdevice/libdc1394.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mak b/common.mak index b1f62d90f7..0b44034ca1 100644 --- a/common.mak +++ b/common.mak @@ -27,7 +27,7 @@ IFLAGS := -I. -I$(SRC_PATH)/ CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) CCFLAGS = $(CFLAGS) -YASMFLAGS += $(IFLAGS) -Pconfig.asm +YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm HOSTCFLAGS += $(IFLAGS) LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) |