diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-02 01:51:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-02 01:54:27 +0200 |
| commit | 4defa68fe25eae4d7c27341e3b35811c047dcd3f (patch) | |
| tree | 9d4d37343ec4c99801c1b76b813b0a5b2b04576b /libavcodec/Makefile | |
| parent | a2f5e14a867768019b49b830e29801f1bfb2abb7 (diff) | |
| parent | aa05f2126e18d23432bde77e6f44e41691472fef (diff) | |
| download | ffmpeg-4defa68fe25eae4d7c27341e3b35811c047dcd3f.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
ac3enc: ARM optimised ac3_compute_matissa_size
ac3: armv6 optimised bit_alloc_calc_bap
fate: simplify fft test rules
avio: document avio_alloc_context.
lavf: make compute_chapters_end less picky.
sierravmd: fix Indeo3 videos
FFT: simplify fft8()
fate: add fixed-point fft/mdct tests
Fixed-point support in fft-test
ape: check that number of seektable entries is equal to number of frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7f771be2b1..0730124870 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -661,7 +661,7 @@ SKIPHEADERS += mpegaudio3.h EXAMPLES = api -TESTPROGS = cabac dct eval fft h264 iirfilter rangecoder snow +TESTPROGS = cabac dct eval fft fft-fixed h264 iirfilter rangecoder snow TESTPROGS-$(HAVE_MMX) += motion TESTOBJS = dctref.o |