Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Jun 2011 00:29:39 +0000 (02:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 Jun 2011 00:30:04 +0000 (02:30 +0200)
commit7b7c47c8f70e51d3835a6153c3e467e59acf8a8b
treeecb00d3a1688c44780d275b2b3209c355f548e0a
parent65eae2a7a2a14926c9f9683544e99982ba565f93
parent8683c6a638f2e323d11b520c5e130b46b1eb1eda
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3enc: move ff_ac3_encode_frame() to ac3enc_template.c
  ac3enc: merge log2_tab() into normalize_samples()
  ac3enc: Remove bit allocation fallbacks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3enc.c
libavcodec/ac3enc.h
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c