diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 13:30:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 13:30:51 +0100 |
| commit | 25ca8aef54b65c77ed36ab5a6877eba18560e6b8 (patch) | |
| tree | 5e90ca85f7a2364a156154e8c9bbc8ca75018736 /configure | |
| parent | e9c372362cb736240dcd87658a027ecfb7b9d240 (diff) | |
| parent | 4a606c830ae664013cea33800094d4d0f4ec62da (diff) | |
| download | ffmpeg-25ca8aef54b65c77ed36ab5a6877eba18560e6b8.tar.gz | |
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
av_memcpy_backptr: optimise some special cases
mpegvideo: simplify dxy calculation in hpel_motion()
build: add rules to generate preprocessed source files
Conflicts:
Makefile
libavutil/mem.c
library.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4243,6 +4243,7 @@ ASFLAGS=$ASFLAGS AS_C=$AS_C AS_O=$AS_O CC_C=$CC_C +CC_E=$CC_E CC_O=$CC_O CXX_C=$CXX_C CXX_O=$CXX_O |