Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Apr 2011 23:51:44 +0000 (01:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Apr 2011 23:54:27 +0000 (01:54 +0200)
commit4defa68fe25eae4d7c27341e3b35811c047dcd3f
tree9d4d37343ec4c99801c1b76b813b0a5b2b04576b
parenta2f5e14a867768019b49b830e29801f1bfb2abb7
parentaa05f2126e18d23432bde77e6f44e41691472fef
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>
libavcodec/Makefile
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/fft-fixed-test.c
libavcodec/fft-test.c
libavcodec/fft.c
libavformat/ape.c
libavformat/avio.h
libavformat/sierravmd.c
libavformat/utils.c