diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 03:01:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 03:09:08 +0200 |
| commit | 445fdc014017a236fa7aa2645ffad7e8d0b45bee (patch) | |
| tree | 1bd6be8b1dbf95535926c0e1348c63027ecb4339 /common.mak | |
| parent | 55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d (diff) | |
| parent | 52fd16a264d1eb14b1a84b7b38041da1756fb216 (diff) | |
| download | ffmpeg-445fdc014017a236fa7aa2645ffad7e8d0b45bee.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: move compute_mantissa_size() to ac3dsp
ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext
Remove support for stripping executables
ac3enc: NEON optimised float_to_fixed24
ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp
dfa: protect pointer range checks against overflows.
Duplicate: mimic: implement multithreading.
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 3d1a1293fb..6daf77cc07 100644 --- a/common.mak +++ b/common.mak @@ -21,7 +21,7 @@ endif ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) -BRIEF = CC AS YASM AR LD HOSTCC STRIP CP +BRIEF = CC AS YASM AR LD HOSTCC SILENT = DEPCC YASMDEP RM RANLIB MSG = $@ M = @$(call ECHO,$(TAG),$@); |